Brodie Rao <brodie@bitheap.org> [Mon, 30 Aug 2010 11:16:21 -0400] rev 12135
test-serve: ensure KILLQUIETLY is only used once
49463314c24f introduced a feature to the hgserve() function that
suppresses errors from kill(1). It wrongly assumed that setting an
environment variable when calling a function would make it local to
the function. It ended up suppressing kill errors for every call
thereafter.
This patch sets KILLQUIETLY=N after use.
Martin Geisler <mg@aragost.com> [Mon, 30 Aug 2010 17:17:20 +0200] rev 12134
dagparser: translate and lowercase error messages
Martin Geisler <mg@aragost.com> [Mon, 30 Aug 2010 17:11:51 +0200] rev 12133
match: mark error messages for translation
Sune Foldager <sune.foldager@edlund.dk> [Wed, 01 Sep 2010 15:03:45 +0200] rev 12132
debugindex(dot): try to access filelogs through repo, if possible
If a repository is accesible, first treat the filename as a working copy file
and try to open its filelog. Fallback to opening the file directly as a
revlog, as before.
Sune Foldager <cryo@cyanite.org> [Wed, 01 Sep 2010 14:55:03 +0200] rev 12131
debugdata: try to access filelogs through repo, if possible
If a repository is accesible, first treat the filename as a working copy file
and try to open its filelog. Fallback to opening the file directly as a
revlog, as before.
Martin Geisler <mg@lazybytes.net> [Wed, 01 Sep 2010 12:28:34 +0200] rev 12130
merge with stable
Brodie Rao <brodie@bitheap.org> [Mon, 30 Aug 2010 20:27:25 -0400] rev 12129
remove: properly set return code when warnings are issued
This removes the warn() function in favor of issuing warnings directly
for each kind of file that Mercurial won't remove.
This also uses three separate translatable strings instead of using
string formatting to build the message. This should make it easier to
localize.
Martin Geisler <mg@lazybytes.net> [Wed, 01 Sep 2010 12:05:57 +0200] rev 12128
pull: lowercase error message
Martin Geisler <mg@lazybytes.net> [Tue, 31 Aug 2010 16:36:31 +0200] rev 12127
commit: sort subrepos before committing for stable test output
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 19:05:13 +0900] rev 12126
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 31 Aug 2010 15:47:13 +0900] rev 12125
test-custom-filter: heredoc is not required for single line operations
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 18:57:48 +0900] rev 12124
tests: unify test-custom-filters
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 18:55:00 +0900] rev 12123
tests: unify test-parse-date
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 18:50:44 +0900] rev 12122
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 18:47:02 +0900] rev 12121
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 14:16:56 +0900] rev 12120
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 14:13:36 +0900] rev 12119
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 14:10:31 +0900] rev 12118
tests: unify test-incoming-outgoing
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 14:06:18 +0900] rev 12117
tests: unify test-resolve
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 14:04:38 +0900] rev 12116
tests: unify test-requires
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 14:01:57 +0900] rev 12115
tests: unify test-relink
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:55:57 +0900] rev 12114
tests: merge the two test-rename-dir-merge* into one
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:51:27 +0900] rev 12113
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:49:40 +0900] rev 12112
tests: unify test-rename-dir-merge
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:46:57 +0900] rev 12111
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:45:24 +0900] rev 12110
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:43:34 +0900] rev 12109
tests: remove useless sed in test-hgrc
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:41:03 +0900] rev 12108
tests: mq-safety: use regular expression instead of sed
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:37:12 +0900] rev 12107
tests: use regular expression instead of sed in test-subrepo-deep-nested-change
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:32:37 +0900] rev 12106
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:29:44 +0900] rev 12105
util: get rid of extra trailing whitespace in parsedate abort message
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:23:32 +0900] rev 12104
tests: unify test-revset
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:18:19 +0900] rev 12103
test-revset: remove trailing whitespaces
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:15:30 +0900] rev 12102
test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:11:32 +0900] rev 12101
tests: remove useless grep -v in test-mq.t
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:08:18 +0900] rev 12100
tests: unify test-remove-new
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:02:54 +0900] rev 12099
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 12:58:43 +0900] rev 12098
tests: unify test-rename
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 12:48:17 +0900] rev 12097
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 12:46:19 +0900] rev 12096
tests: unify test-inherit-mode
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 12:41:43 +0900] rev 12095
tests: unify test-churn
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 12:02:31 +0900] rev 12094
tests: convert test-bisect
Brodie Rao <brodie@bitheap.org> [Fri, 27 Aug 2010 20:45:18 -0400] rev 12093
alias: on --debug, print expansion when it has invalid arguments
Brodie Rao <brodie@bitheap.org> [Fri, 27 Aug 2010 20:45:11 -0400] rev 12092
alias: print what command is being shadowed in debug message
Martin Geisler <mg@lazybytes.net> [Mon, 30 Aug 2010 22:52:00 +0200] rev 12091
merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 30 Aug 2010 22:47:38 +0200] rev 12090
mail: use standard section.entry format in error message
Augie Fackler <durin42@gmail.com> [Sat, 28 Aug 2010 21:57:36 -0500] rev 12089
color: accept usual boolean values as synonyms for always and never
Augie Fackler <durin42@gmail.com> [Mon, 30 Aug 2010 10:28:25 -0500] rev 12088
parsebool: accept always as true and never as false
Augie Fackler <durin42@gmail.com> [Sat, 28 Aug 2010 21:50:35 -0500] rev 12087
parsebool: create new function and use it for config parsing
Augie Fackler <durin42@gmail.com> [Sat, 28 Aug 2010 21:49:53 -0500] rev 12086
util: clean up trailing whitespace
Martin Geisler <mg@aragost.com> [Mon, 30 Aug 2010 14:38:24 +0200] rev 12085
Consistently import foo as foomod when foo to avoid shadowing
This is in the style of 5f091fc1bab7.
Martin Geisler <mg@aragost.com> [Mon, 30 Aug 2010 13:00:22 +0200] rev 12084
Merge with stable
Brodie Rao <brodie@bitheap.org> [Fri, 27 Aug 2010 22:36:35 -0400] rev 12083
help: refer to user configuration file more consistently
Currently, a number of commands and help topics mention the user hgrc
file in different ways. Among these are following:
1. .hgrc - "please specify your commit editor/username in your .hgrc
file", bookmarks, color, hgk, pager, hg help environment
2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1)
3. ~/.hgrc - hgrc(5)
In addition to being inconsistent, none of these make sense on
Windows. This patch replaces the above with a more general term of
"[your] configuration file".
Adrian Buehlmann <adrian@cadifra.com> [Mon, 30 Aug 2010 11:39:43 +0200] rev 12082
tests: unify test-config-case
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 29 Aug 2010 23:16:31 +0200] rev 12081
win32: add hgweb scripts to Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 29 Aug 2010 22:57:24 +0200] rev 12080
win32: add Emacs scripts to Inno Setup installer
Martin Geisler <mg@lazybytes.net> [Sun, 29 Aug 2010 23:56:19 +0200] rev 12079
path_auditor: delegate checking of nested repos to a callback
Martin Geisler <mg@lazybytes.net> [Sun, 29 Aug 2010 23:56:19 +0200] rev 12078
util: use 'auditor' as consistent name for path auditors
Martin Geisler <mg@lazybytes.net> [Sun, 29 Aug 2010 23:56:19 +0200] rev 12077
util: add optional path auditor argument to canonpath
The canonpath function will default to creating its own path auditor,
but in some cases it will be useful to use a specialized auditor,
e.g., one that wont abort if a path lies within a subrepository.
Brodie Rao <brodie@bitheap.org> [Sat, 28 Aug 2010 12:31:07 -0400] rev 12076
mail/hgweb: support service names for ports (issue2350)
This adds util.getport(port) which tries to parse port as an int, and
failing that, looks it up using socket.getservbyname(). Thus, the
following will work:
[smtp]
port = submission
[web]
port = http
This does not apply to ports in URLs used in clone, pull, etc.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 27 Aug 2010 16:25:47 +0200] rev 12075
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 27 Aug 2010 16:25:47 +0200] rev 12074
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 27 Aug 2010 16:25:47 +0200] rev 12073
tests: unify test-help
Adrian Buehlmann <adrian@cadifra.com> [Fri, 27 Aug 2010 00:27:40 +0200] rev 12072
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com> [Thu, 26 Aug 2010 12:41:00 +0200] rev 12071
tests: unify test-lock-badness
Martin Geisler <mg@lazybytes.net> [Sun, 29 Aug 2010 22:55:37 +0200] rev 12070
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 29 Aug 2010 22:46:00 +0200] rev 12069
churn: do not crash on malformed lines in alias file
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Sun, 29 Aug 2010 10:54:22 +0200] rev 12068
churn: do not crash on empty lines in alias file
Martin Geisler <mg@lazybytes.net> [Sun, 29 Aug 2010 22:37:58 +0200] rev 12067
Lowercase error messages
Georg Brandl <georg@python.org> [Sat, 28 Aug 2010 23:57:39 +0200] rev 12066
localrepo: introduce method for explicit branch cache update
Currently, localrepo.branchtags() is called in two locations to update the
_branchcache dict, however branchtags() itself does not update anything, it
calls branchmap() to do so. This change introduces a new updatebranchcache()
method that is used by both branchmap() and the calls to update the cache.
Steve Borho <steve@borho.org> [Fri, 27 Aug 2010 22:24:47 -0500] rev 12065
color: handle more Windows console errors
If your application is being built as a non-console application,
stdout is not a valid handle and raises an exception:
pywintypes.error: (6, 'DuplicateHandle', 'The handle is invalid.')
Alternatively, non-console applications launched outside of a
console will return None from GetStdHandle instead of raising an
exception.
Christian Ebert <blacktrash@gmx.net> [Wed, 25 Aug 2010 23:26:18 +0100] rev 12064
patchbomb: remove unneeded line continuation
Brodie Rao <brodie@bitheap.org> [Fri, 27 Aug 2010 13:32:40 -0400] rev 12063
cleanup: remove unused variables
Brodie Rao <brodie@bitheap.org> [Fri, 27 Aug 2010 13:32:38 -0400] rev 12062
cleanup: remove unused imports
Martin Geisler <mg@lazybytes.net> [Fri, 27 Aug 2010 13:18:25 +0200] rev 12061
Merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 27 Aug 2010 13:03:57 +0200] rev 12060
subrepo: use [0-9] instead of [\d] in svn subrepo regex
The \d was used in a normal (not raw) string and was only passed
through to re.search because Python does not define that escape
character itself. Using 0-9 makes it clearer what is happening.
Patrick Mezard <pmezard@gmail.com> [Thu, 26 Aug 2010 23:38:13 +0200] rev 12059
webcommands: remove unncessary access to repo.changelog
changectx are good enough in these cases and their interface is more stable.
Patrick Mezard <pmezard@gmail.com> [Thu, 26 Aug 2010 23:38:13 +0200] rev 12058
archival: do not use repo.changelog directly
Patrick Mezard <pmezard@gmail.com> [Thu, 26 Aug 2010 23:38:13 +0200] rev 12057
repair: pass variable explicitely to nested function
Mads Kiilerich <mads@kiilerich.com> [Thu, 26 Aug 2010 23:11:03 +0200] rev 12056
mercurial.spec: specify file modes for install
Mads Kiilerich <mads@kiilerich.com> [Thu, 26 Aug 2010 22:51:48 +0200] rev 12055
simplemerge: remove hash-bang from non-executable script
Matt Mackall <mpm@selenic.com> [Thu, 26 Aug 2010 11:03:12 -0500] rev 12054
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Aug 2010 11:00:46 -0500] rev 12053
Added signature for changeset ff5cec76b1c5
Matt Mackall <mpm@selenic.com> [Thu, 26 Aug 2010 11:00:42 -0500] rev 12052
Added tag 1.6.3 for changeset ff5cec76b1c5
Sol Jerome <sol.jerome@gmail.com> [Tue, 17 Aug 2010 17:38:19 -0500] rev 12051
util: avoid using hashlib on Python < 2.5 (issue2278)
The following patch allows the use of python2.4 with a standalone
hashlib rather than assuming that python2.5 is in use when hashlib is
imported successfully.
Matt Mackall <mpm@selenic.com> [Mon, 16 Aug 2010 12:55:42 -0500] rev 12050
templates: add filenolink to raw style (issue2332)
Martin Geisler <mg@aragost.com> [Fri, 13 Aug 2010 10:53:10 +0200] rev 12049
url: limit expansion to safe auth keys (Issue2328)
Mads Kiilerich pointed out that 7c9beccb0533 was too eager since the
prefix and password keys may contain $-signs. So this only add the
username to the list of keys that are expanded.
This also updates the documentation to match.
Martin Geisler <mg@aragost.com> [Fri, 13 Aug 2010 10:10:11 +0200] rev 12048
url: expand vars in all [auth] settings (issue2328)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Aug 2010 17:55:07 +0200] rev 12047
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Aug 2010 17:38:43 +0200] rev 12046
Fix merge-tools.checkconflicts
re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".
Now conflict markers inside the file are found, too.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Aug 2010 17:38:43 +0200] rev 12045
Fix merge-tools.checkconflicts
re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".
Now conflict markers inside the file are found, too.
Matt Mackall <mpm@selenic.com> [Wed, 25 Aug 2010 16:55:54 -0500] rev 12044
bundlerepo: remove duplication of bundle decompressors
Matt Mackall <mpm@selenic.com> [Wed, 25 Aug 2010 16:53:06 -0500] rev 12043
bundle: introduce bundle class
Matt Mackall <mpm@selenic.com> [Wed, 25 Aug 2010 15:33:06 -0500] rev 12042
bundle: unify/refactor unbundle/readbundle
Matt Mackall <mpm@selenic.com> [Wed, 25 Aug 2010 15:33:05 -0500] rev 12041
bundle: factor out decompressor
Matt Mackall <mpm@selenic.com> [Wed, 25 Aug 2010 15:20:25 -0500] rev 12040
merge with stable