Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 11:03:45 -0700] rev 2930
patchbomb: import new mail module
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 11:03:32 -0700] rev 2929
mail: fix connect
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 18 Aug 2006 13:07:35 +0200] rev 2928
merge with tah
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 18 Aug 2006 13:06:38 +0200] rev 2927
Fix hgweb's patch display in changeset view.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 23:37:37 +0300] rev 2926
hgext: more patchbomb documentation
+ Add a description of how to enable this extension
+ Note which command it provides (it's not very easy to guess
that "hgext.patchbomb" enables the "email" command, unless one
can read Python sources)
+ Expand the descriptions of the -n and -m options of "hg email".
+ Mention that formail is (commonly) part of the procmail package.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:53:01 -0700] rev 2925
make new tests executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 21:49:49 +0300] rev 2924
tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 21:22:26 +0300] rev 2923
tests: new test for "hg annotate"
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:52:42 -0700] rev 2922
override previous merge with mpm.
merge at
ef8ee4477019 was bad.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:52:19 -0700] rev 2921
redo merge with mpm.
previous merge at
ef8ee4477019 was bad.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:46:24 -0700] rev 2920
merge with mpm.
Brendan Cully <brendan@kublai.com> [Tue, 15 Aug 2006 11:28:50 -0700] rev 2919
Unify mq and hg patch invocation.
This makes patch a little less verbose by default, so the tests
had to be updated.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:43:31 -0700] rev 2918
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:42:50 -0700] rev 2917
make test-mq-qdiff executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 20:59:55 +0300] rev 2916
tests: new test for mq qdiff command
`hg qdiff .' is supposed to work but it is currently broken.
This test should help us verify when it gets fixed.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:38:07 -0700] rev 2915
merge with other head by default, not tip.
fixes issue 339.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 09:37:58 -0700] rev 2914
merge with mpm.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 18:14:58 +0300] rev 2913
Tune a bit the extdiff toplevel comments/samples.
* Capitalize the first letter of all sentences
* Add an example for GNU diff(1) 'context diff' mode.
* Explain the requirement for separate cmd.xxx and opts.xxx
options in .hgrc, which hopefully will guard against users
trying to add:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff -Nprc5
which fails for recent crew builds with:
$ hg cdiff .
making snapshot of 1 files from rev
07dc4a569f4e
making snapshot of 1 files from working dir
diff -Nprc5: not found
The correct way to do this is by separating the cmd.cdiff and
opts.cdiff parts like this:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff
opts.cdiff = -Nprc5
so add it as a new example and explicitly describe it in the
extdiff comments.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 16:04:47 +0200] rev 2912
Fixed test-extdiff.
diff-like tools usually return 1 if differences are found.
Currently the extdiff returns 256, but that's a different topic
(consolidating return code handling in hg).
Brendan Cully <brendan@kublai.com> [Tue, 15 Aug 2006 00:03:48 -0700] rev 2911
A fix for --prune.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 11:47:17 +0200] rev 2910
Adjusted test to changed help output.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 11:22:29 +0200] rev 2909
merge with jeffpc
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 15 Aug 2006 05:12:27 -0400] rev 2908
Use demandload in hgk
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 22:48:03 -0700] rev 2907
Add diff --git option
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 14 Aug 2006 15:51:35 -0700] rev 2906
extdiff: fix bugs. add test.
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:41:08 -0700] rev 2905
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:24:19 -0700] rev 2904
Replace qdel/qfold -f option with -k/--keep.
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:10:21 -0700] rev 2903
Properly shell-quote arguments in extdiff
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:07:15 -0700] rev 2902
Update extdiff for recent refactoring
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 10:27:02 -0700] rev 2901
Test for log --prune.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Mon, 14 Aug 2006 16:06:37 +0300] rev 2900
hgweb: partially revert
4ec58b157265
The change from self.repo.ui.diffopts() to ui.diffopts() causes a
traceback when the diff of a changeset should be displayed in the
web interface. Revert to self.repo.ui.diffopts() for now.
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 23:17:06 -0500] rev 2899
merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 22:46:35 -0500] rev 2898
merge: use file size stored in revlog index
Add size method to filelog to handle nodes with renames
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:30:21 -0500] rev 2897
merge: move forgets to the apply stage
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:12:36 -0500] rev 2896
trivial bool() cleanup
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:28:00 -0500] rev 2895
filelog.cmp: return 0 for equality
spotted by Alexis Carvalho
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:27:19 -0500] rev 2894
merge: hoist some working manifest logic out of merge loop
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:12:51 -0500] rev 2893
merge: working manifest new/changed
To remove dependence on m1 during manifest comparison, we distinguish between
new and changed states in mw.
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:58:10 -0500] rev 2892
merge: factor out exec bit merge function
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:45:45 -0500] rev 2891
Use revlog hash comparison technique in merge
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 14:18:13 -0500] rev 2890
Move cmp bits from filelog to revlog
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 14:06:50 -0500] rev 2889
Move ui.sendmail to mail.connect/sendmail
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 11:34:08 -0500] rev 2888
Move ui.diffopts to patch.diffopts where it belongs
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 15:07:00 -0500] rev 2887
filelog: add hash-based comparisons
For status, rather than reconstruct full file versions from revlog for
comparison, compare hashes.
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 14:42:15 -0500] rev 2886
Merge with crew
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 17:03:33 -0700] rev 2885
cmdutil.matchpats: allow include/exclude to be optional.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 17:03:03 -0700] rev 2884
add default values to arguments of walk etc.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 16:57:45 -0700] rev 2883
move commands.addremove_lock to cmdutil.addremove