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.