Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 12:04:48 -0500] rev 3211
merge: extend file merge function for renames
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 30 Sep 2006 15:15:59 +0200] rev 3210
correctly find the type of 'id' in revlog.lookup
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 12:34:31 +0200] rev 3209
merged brendan's hgweb cleanups
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3208
hgweb: teach siblings and callers to use contexts
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3207
Add lookup method to filectx
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3206
hgweb: kill off #filenode#
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3205
hgweb: kill #manifest#
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 10:29:57 +0200] rev 3204
Remove duplicate walkopts + dryrunopts from addremove.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 09:46:03 +0200] rev 3203
Merge with upstream
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 09:39:44 +0200] rev 3202
Remove unneeded (and bashismic) export HGMERGE=true.
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 18:17:29 -0700] rev 3201
Templater expects an iterable copies variable (fixes notify).
Stephen Darnell <stephen@darnell.plus.com> [Thu, 28 Sep 2006 21:00:01 +0100] rev 3200
Remove single character equivalent of --nodates (was -D)
Stephen Darnell <stephen@darnell.plus.com> [Tue, 26 Sep 2006 00:05:24 +0100] rev 3199
Add -D/--nodates options to hg diff/export that removes dates from diff headers
and replace uses of sed in the tests with --nodates.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 23:14:22 +0200] rev 3198
Documentation clarification for --update option to pull and unbundle
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:01:19 -0700] rev 3197
Show copies in hg log.
The format is:
copies: destination (source)...
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:00:54 -0700] rev 3196
Abstract manifest block parsing.
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:00:36 -0700] rev 3195
Make hg.repository work with no path argument
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 21:24:45 +0200] rev 3194
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 21:24:15 +0200] rev 3193
Make "hg log --style=changelog > changelog" work (
issue338)
Style files in templates/ now take precedence over current directory.
This can be overridden with --style=./changelog if really neeeded.
Added test for
issue338.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 19:43:07 +0200] rev 3192
Clarify precedence for template/style in commands.show_changeset():
Display format will be the first non-empty hit of:
1. option 'template'
2. option 'style'
3. [ui] setting 'logtemplate'
4. [ui] setting 'style'
If all of these values are either the unset or the empty string,
regular display via changeset_printer() is done.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 20:00:24 +0200] rev 3191
add remoteopts to bundle command
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 19:59:06 +0200] rev 3190
factor opts: remote repo access options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 18:39:49 +0200] rev 3189
factor opts: --dry-run option
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 18:39:32 +0200] rev 3188
factor opts: walk options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 18:39:08 +0200] rev 3187
factor opts: move globalopts to a more logical place
we will put other options at the same place
Brendan Cully <brendan@kublai.com> [Thu, 28 Sep 2006 11:41:33 -0700] rev 3186
mq: raise util.Abort instead of using sys.exit(1)
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 14:50:20 -0700] rev 3185
mq: don't write applied patches into series twice in restore
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 14:32:53 -0700] rev 3184
mq: bail out if a patch appears more than once in the series file.
Closes: #379.
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 13:34:20 -0700] rev 3183
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
This moves most of the queue display code into qseries.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 27 Sep 2006 21:44:20 +0200] rev 3182
Merge with crew