Brendan Cully <brendan@kublai.com> [Fri, 01 Dec 2006 13:50:09 -0800] rev 3752
transplant: "filtering %s\n"
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 22:29:47 +0100] rev 3751
Don't require a diff which accepts the -N option.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 22:09:05 +0100] rev 3750
Compatibility fix for 'ln -sf'.
ln of Solaris 8 only accepts "ln -f -s" (in that order), but as the -f isn't
needed here, I simply dropped it.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 01 Dec 2006 16:18:16 -0200] rev 3749
additional fixes for
issue436
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 15:40:23 +0100] rev 3748
Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 14:46:05 +0100] rev 3747
Fix test-notify for systems without or with a different version of diffstat.
Some diffstat versions say "1 file changed", others "1 files changed".
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 13:11:09 +0100] rev 3746
merge with upstream
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 01 Dec 2006 09:42:07 +0100] rev 3745
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 02:35:46 -0600] rev 3744
verify: add rename link checking
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 02:24:56 -0600] rev 3743
Make revlog error slightly less scary
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:42:52 -0600] rev 3742
Fix argument handling for hg -v pull -v x (issue 436)
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:29:14 -0600] rev 3741
update bugzilla extension to use ui buffers
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:29:13 -0600] rev 3740
add test for the notify extension
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:28:20 -0600] rev 3739
fix notify with new ui buffering
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:28:19 -0600] rev 3738
use ui buffering in changeset printer
delete old uibuffer class
delete old stringio class
move show to _show
add new show that uses ui.pushbuffer to buffer
add new flush that writes buffered data
add props arg to changeset_printer to match _templater
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:28:18 -0600] rev 3737
add a simple nested buffering scheme to ui
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 22:38:48 -0600] rev 3736
make manifest friendlier
switch to using context code
..which uses first parent by default
show file hashes only with debug switch
show permissions with verbose
fix up tests
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 19:50:28 -0600] rev 3735
Add missing test output
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 18:22:44 -0600] rev 3734
Fix test permission
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3733
merge: handle directory renames
commit: handle new copy dirstate case correctly
findcopies:
keep a map of all copies found for directory logic
add dirs filter
check for merge:followdirs config option
generate a directory move map
find files that match directory move map
manifestmerge:
add directory rename cases
applyupdates:
skip actions with None file
add "d" action
recordupdates:
add "d" action
add simple directory rename test
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3732
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3731
merge: move check for empty ancestor into findcopies
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3730
merge: only store one direction of copies in the copy map
simplify checkpair
generate copied hash from copy map
make copy cases more symmetrical
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3729
merge: add copied hash to simplify copy logic
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3728
merge: remove unused match logic from findcopies
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3727
merge: report destinations of moves in merge action messages
Brendan Cully <brendan@kublai.com> [Thu, 30 Nov 2006 13:51:58 -0800] rev 3726
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com> [Thu, 30 Nov 2006 11:32:40 -0800] rev 3725
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com> [Thu, 30 Nov 2006 11:09:25 -0800] rev 3724
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com> [Wed, 29 Nov 2006 22:34:22 -0800] rev 3723
transplant: show_changeset moved to cmdutil
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 29 Nov 2006 08:49:45 +0100] rev 3722
Make sed expression in test-committer compatible with GNU sed 3.x.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Nov 2006 21:16:05 +0100] rev 3721
only print a warning when no username is specified
- revert most of
8b55c0ba
- display the username during interactive commit
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Nov 2006 19:11:46 +0100] rev 3720
add a comment about '\n' and '\r' and streaming clone
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Nov 2006 11:28:45 +0100] rev 3719
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Nov 2006 22:56:26 -0200] rev 3718
fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Nov 2006 22:03:36 -0200] rev 3717
handle files with more than one git binary patch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Nov 2006 22:03:31 -0200] rev 3716
handle files with both git binary patches and copy/rename ops
Brendan Cully <brendan@kublai.com> [Mon, 27 Nov 2006 15:27:09 -0800] rev 3715
Make context __eq__ handle arbitrary RHS values
Brendan Cully <brendan@kublai.com> [Mon, 27 Nov 2006 15:13:01 -0800] rev 3714
Add transplant extension
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Nov 2006 22:22:44 +0100] rev 3713
don't create the .hg/data at init time
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Nov 2006 20:55:50 +0100] rev 3712
context: None is not a valid filenode (revert from
23ede9e7ad4d)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 26 Nov 2006 13:28:30 +0100] rev 3711
update rewrite-log for tip ; chmod it
Brendan Cully <brendan@kublai.com> [Thu, 23 Nov 2006 22:45:00 -0800] rev 3710
merge: Don't search for copies across unrelated manifests
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 22 Nov 2006 00:53:56 +0200] rev 3709
Expand test-commit to cover one of the recent bugs.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Nov 2006 23:07:15 +0100] rev 3708
Make mq use changegroup.writebundle for writing strip backups.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Nov 2006 23:02:28 +0100] rev 3707
Removed unused ui parameter from revpair/revrange and fix its users.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Nov 2006 22:33:57 +0100] rev 3706
Use 'bundletype' instead of 'type' to not shadow built-in function.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Nov 2006 22:32:23 +0100] rev 3705
BZ2Compressor already defaults to compresslevel=9.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Nov 2006 22:08:00 +0100] rev 3704
fix writebundle for bz2 bundles
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 21 Nov 2006 23:08:29 -0200] rev 3703
fix push over HTTP to older servers
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:46 -0200] rev 3702
Don't generate git patches that rename a file to multiple destinations
With this patch, instead of generating N renames, we'll generate
1 rename and N-1 copies.
Ideally the rename should come after the copies instead of before
them, but that'd be harder to do.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:45 -0200] rev 3701
handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:43 -0200] rev 3700
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:42 -0200] rev 3699
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:41 -0200] rev 3698
qrefresh: respect --git even in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:40 -0200] rev 3697
add --git option to qdiff
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:38 -0200] rev 3696
diff: better detection of renames when comparing with the working dir.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:37 -0200] rev 3695
fix typo in mercurial/patch.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:36 -0200] rev 3694
renamedbetween: only return (file, node) pairs that exist in the original rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 20 Nov 2006 19:32:35 -0200] rev 3693
diff: improve detection of renames when diffing across many revisions