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
Brodie Rao <brodie@bitheap.org> [Sat, 21 Aug 2010 22:48:14 -0400] rev 12039
alias: make shadowing behavior more consistent (issue2054)
Currently, given an alias like the following:
[alias]
summary = summary --remote
The alias might be executed - or it might not - depending on the order
of the cmdtable dict.
This happens because cmdalias gets assigned back to the cmdtable like so:
cmdtable['summary'] = ...
Yet '^summary|sum' is still in the table, so which one cmdutil.findcmd()
chooses isn't deterministic.
This patch makes cmdalias assign back to '^summary|sum'. It uses the same
cmdtable key lookup that extensions.wrapcommand() does.
Yuya Nishihara <yuya@tcha.org> [Tue, 24 Aug 2010 23:30:51 +0900] rev 12038
hgweb: handle exception of misconfigured path on index page
If hgweb.config contains wrong path mapping, hgweb causes internal server
error on repository index page.
This patch changes makeindex() to ignore RepoError, because it looks to be
designed to suppress configuration error.
Matt Mackall <mpm@selenic.com> [Tue, 24 Aug 2010 13:13:35 -0500] rev 12037
statichttprepo: disable pushkey
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 13 Aug 2010 16:05:08 +0200] rev 12036
mq: extend support for the --mq argument to extension commands
This allows commands like `purge' to accept the --mq option.
Patrick Mezard <pmezard@gmail.com> [Sun, 22 Aug 2010 13:17:34 +0200] rev 12035
repository: drop unused rjoin() method
This method was introduced by cfeeac24fc1e but grepping the history does not
reveal any call. Extensions may use it but the method intent is not even clear
to me.
Adrian Buehlmann <adrian@cadifra.com> [Tue, 24 Aug 2010 15:13:11 +0200] rev 12034
tests: unify test-export
Martin Geisler <mg@lazybytes.net> [Wed, 25 Aug 2010 16:40:49 +0200] rev 12033
revert: wrap long line
Martin Geisler <mg@lazybytes.net> [Wed, 25 Aug 2010 16:23:32 +0200] rev 12032
util: remove lexists, Python 2.4 introduced os.path.lexists
Martin Geisler <mg@lazybytes.net> [Wed, 25 Aug 2010 13:40:46 +0200] rev 12031
Merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 25 Aug 2010 13:29:46 +0200] rev 12030
context: mark string for translation
Mads Kiilerich <mads at kiilerich.com> [Thu, 01 Jul 2010 16:30:41 +0200] rev 12029
test-convert-cvs: test fuzz
Mads Kiilerich <mads@kiilerich.com> [Mon, 23 Aug 2010 22:32:36 +0200] rev 12028
test-dispatch: drop test for missing working directory
hstuart reported problems when the local Python has been configured to do stuff
and crash before reaching the expected error handler.
Martin Geisler <mg@lazybytes.net> [Mon, 23 Aug 2010 22:22:05 +0200] rev 12027
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 23 Aug 2010 22:16:56 +0200] rev 12026
bookmarks: guard against listing bookmarks on unsupported repos
This fixes clones and pulls from statichttprepository repos.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Aug 2010 13:28:04 +0200] rev 12025
mdiff.patch(): add a special case for when the base text is empty
remove the special casing from revlog.addgroup()
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Aug 2010 13:24:19 +0200] rev 12024
revlog: add rawsize(), identical to size() but not subclassed by filelog
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Aug 2010 23:17:17 +0200] rev 12023
revlog.addrevision(): move computation of nodeid in addrevision()
The check "if node in nodemap" is already done earlier in addgroup().
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Aug 2010 19:41:04 +0200] rev 12022
contrib/compress: compress should activate parentdelta
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Aug 2010 19:27:09 +0200] rev 12021
contrib/compress: correct ordering of copying
Changelog should always be copied last, otherwise readers can see an
inconsistent repo.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Aug 2010 19:26:07 +0200] rev 12020
contrib/compress: refactor revlog copying
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Aug 2010 19:13:30 +0200] rev 12019
contrib/compress: use store API instead of a collector
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Aug 2010 18:29:30 +0200] rev 12018
contrib/compress: proper lock handling
Lock the src repo before beginning the compression and lock the destination
repo before copying the revlogs.
Proper handling of exceptions.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Aug 2010 18:23:32 +0200] rev 12017
contrib/compress: use hg API to compute the destination path
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Aug 2010 18:21:30 +0200] rev 12016
contrib/compress: use repo's transaction method
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Aug 2010 18:18:36 +0200] rev 12015
contrib/compress: remove unused variables
Brodie Rao <brodie@bitheap.org> [Sat, 21 Aug 2010 23:24:52 -0400] rev 12014
tests: unify test-hgrc
Patrick Mezard <pmezard@gmail.com> [Sun, 22 Aug 2010 12:04:15 +0200] rev 12013
tests: remove test-log.out, useless after unification
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 21 Aug 2010 19:31:59 +0200] rev 12012
revlog: fix docstring
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 21 Aug 2010 19:30:42 +0200] rev 12011
deltaparent(): don't return nullrev for a revision containing a full snapshot
this allows us to simplify manifest.readdelta and revlog.revdiff
Matt Mackall <mpm@selenic.com> [Sat, 21 Aug 2010 10:48:49 -0500] rev 12010
merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 21 Aug 2010 10:44:57 -0500] rev 12009
tests: fix up bisect test output
Matt Mackall <mpm@selenic.com> [Sat, 21 Aug 2010 10:41:29 -0500] rev 12008
merge: move reverse-merge logic out of filemerge (issue2342)
Matt Mackall <mpm@selenic.com> [Fri, 20 Aug 2010 21:28:14 -0500] rev 12007
bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com> [Fri, 20 Aug 2010 21:23:47 -0500] rev 12006
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 20 Aug 2010 17:16:37 -0500] rev 12005
bisect: better message for unrelated starting revisions
Matt Mackall <mpm@selenic.com> [Fri, 20 Aug 2010 15:31:05 -0500] rev 12004
debuginstall: report installpath
Adrian Buehlmann <adrian@cadifra.com> [Fri, 20 Aug 2010 18:26:20 +0200] rev 12003
tests: unify test-glog
Matt Mackall <mpm@selenic.com> [Thu, 19 Aug 2010 17:33:46 -0500] rev 12002
bookmarks: fix long line