Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:43:31 -0700] rev 2906
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:42:50 -0700] rev 2905
make test-mq-qdiff executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 20:59:55 +0300] rev 2904
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 2903
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 2902
merge with mpm.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 18:14:58 +0300] rev 2901
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.
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 15:07:00 -0500] rev 2900
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 2899
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 14:14:08 -0500] rev 2898
merge: minor simplification
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 16:04:47 +0200] rev 2897
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 2896
A fix for --prune.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 11:47:17 +0200] rev 2895
Adjusted test to changed help output.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 11:22:29 +0200] rev 2894
merge with jeffpc
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 15 Aug 2006 05:12:27 -0400] rev 2893
Use demandload in hgk
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 22:48:03 -0700] rev 2892
Add diff --git option
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 14 Aug 2006 15:51:35 -0700] rev 2891
extdiff: fix bugs. add test.
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:41:08 -0700] rev 2890
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:24:19 -0700] rev 2889
Replace qdel/qfold -f option with -k/--keep.
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:10:21 -0700] rev 2888
Properly shell-quote arguments in extdiff
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:07:15 -0700] rev 2887
Update extdiff for recent refactoring
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 10:27:02 -0700] rev 2886
Test for log --prune.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Mon, 14 Aug 2006 16:06:37 +0300] rev 2885
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.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 17:03:33 -0700] rev 2884
cmdutil.matchpats: allow include/exclude to be optional.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 17:03:03 -0700] rev 2883
add default values to arguments of walk etc.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 16:57:45 -0700] rev 2882
move commands.addremove_lock to cmdutil.addremove
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 16:11:22 -0700] rev 2881
move walk and matchpats from commands to cmdutil.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 15:24:30 -0700] rev 2880
fix patch.patch.filterfiles.
now test-diff-subdir passes.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 15:03:48 -0700] rev 2879
make test-diff-subdir executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 13 Aug 2006 23:00:18 +0300] rev 2878
tests: new test for hg diff of a subdirectory only
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 13 Aug 2006 18:35:24 +0300] rev 2877
Make clear that hg pull -r REV pulls "up to" a revision.
The existing message was a bit confusing, making the reader
believe that only the specific revision is pulled.