Matt Mackall
b24119a251
Fix test permission
2006-11-30 18:22:44 -06:00
Matt Mackall
05748f203d
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
2006-11-30 17:36:33 -06:00
Matt Mackall
452ab5fc24
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
2006-11-30 17:36:33 -06:00
Matt Mackall
f8e4088f12
merge: move check for empty ancestor into findcopies
2006-11-30 17:36:33 -06:00
Matt Mackall
f9ab52977a
merge: only store one direction of copies in the copy map
...
simplify checkpair
generate copied hash from copy map
make copy cases more symmetrical
2006-11-30 17:36:33 -06:00
Matt Mackall
224d8a5d1f
merge: add copied hash to simplify copy logic
2006-11-30 17:36:33 -06:00
Matt Mackall
1c0e2e44bd
merge: remove unused match logic from findcopies
2006-11-30 17:36:33 -06:00
Matt Mackall
8732a61bab
merge: report destinations of moves in merge action messages
2006-11-30 17:36:33 -06:00
Brendan Cully
deae5133ad
transplant: recover added/removed files after failed application
2006-11-30 13:51:58 -08:00
Brendan Cully
d88675f9d4
transplant: preserve filter changes in --continue log
2006-11-30 11:32:40 -08:00
Brendan Cully
e5abdcc7fc
transplant: fix --continue; add --continue test
2006-11-30 11:09:25 -08:00
Brendan Cully
0dcb9f5388
transplant: show_changeset moved to cmdutil
2006-11-29 22:34:22 -08:00
Thomas Arendsen Hein
aaab521292
Make sed expression in test-committer compatible with GNU sed 3.x.
2006-11-29 08:49:45 +01:00
Benoit Boissinot
3bad25e752
only print a warning when no username is specified
...
- revert most of 8b55c0ba
- display the username during interactive commit
2006-11-28 21:16:05 +01:00
Benoit Boissinot
6d0bb2e251
add a comment about '\n' and '\r' and streaming clone
2006-11-28 19:11:46 +01:00
Benoit Boissinot
a6e6999181
add test for issue433
2006-11-28 11:28:45 +01:00
Alexis S. L. Carvalho
3ef2e9ed94
fix hg log -r ''
2006-11-27 22:56:26 -02:00
Alexis S. L. Carvalho
7781594dc0
handle files with more than one git binary patch
2006-11-27 22:03:36 -02:00
Alexis S. L. Carvalho
b0141a470e
handle files with both git binary patches and copy/rename ops
2006-11-27 22:03:31 -02:00
Brendan Cully
261404dfe1
Make context __eq__ handle arbitrary RHS values
2006-11-27 15:27:09 -08:00
Brendan Cully
dc483d8d44
Add transplant extension
2006-11-27 15:13:01 -08:00
Benoit Boissinot
684e2e23c3
don't create the .hg/data at init time
2006-11-27 22:22:44 +01:00
Benoit Boissinot
97597496aa
context: None is not a valid filenode (revert from ae31fe77b54b)
2006-11-27 20:55:50 +01:00
Benoit Boissinot
cf739ae9f7
update rewrite-log for tip ; chmod it
2006-11-26 13:28:30 +01:00
Brendan Cully
791078de93
merge: Don't search for copies across unrelated manifests
2006-11-23 22:45:00 -08:00
Giorgos Keramidas
186991c839
Expand test-commit to cover one of the recent bugs.
2006-11-22 00:53:56 +02:00
Thomas Arendsen Hein
678567f5fc
Make mq use changegroup.writebundle for writing strip backups.
2006-11-22 23:07:15 +01:00
Thomas Arendsen Hein
ea20cdf3f7
Removed unused ui parameter from revpair/revrange and fix its users.
2006-11-22 23:02:28 +01:00
Thomas Arendsen Hein
873d44b19d
Use 'bundletype' instead of 'type' to not shadow built-in function.
2006-11-22 22:33:57 +01:00
Thomas Arendsen Hein
a73c25c144
BZ2Compressor already defaults to compresslevel=9.
2006-11-22 22:32:23 +01:00
Benoit Boissinot
0427029f2e
fix writebundle for bz2 bundles
2006-11-22 22:08:00 +01:00
Alexis S. L. Carvalho
cebbac3269
fix push over HTTP to older servers
2006-11-21 23:08:29 -02:00
Alexis S. L. Carvalho
6d99bd2633
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.
2006-11-20 19:32:46 -02:00
Alexis S. L. Carvalho
7f7845c518
handle git patches that rename a file to more than one destination
2006-11-20 19:32:45 -02:00
Alexis S. L. Carvalho
f6e774dd91
qrefresh: fix handling of copies in the fast path
2006-11-20 19:32:43 -02:00
Alexis S. L. Carvalho
63b6839f96
qrefresh: fix handling of added files (including copies) in the slow path
2006-11-20 19:32:42 -02:00
Alexis S. L. Carvalho
eb62b3a806
qrefresh: respect --git even in the slow path
2006-11-20 19:32:41 -02:00
Alexis S. L. Carvalho
b298d93260
add --git option to qdiff
2006-11-20 19:32:40 -02:00
Alexis S. L. Carvalho
f2de15a6f8
diff: better detection of renames when comparing with the working dir.
2006-11-20 19:32:38 -02:00
Alexis S. L. Carvalho
bc9e70b94a
fix typo in mercurial/patch.py
2006-11-20 19:32:37 -02:00
Alexis S. L. Carvalho
fdbef41b13
renamedbetween: only return (file, node) pairs that exist in the original rev
2006-11-20 19:32:36 -02:00
Alexis S. L. Carvalho
588b7cf1f1
diff: improve detection of renames when diffing across many revisions
2006-11-20 19:32:35 -02:00
Brendan Cully
185cd7ed4a
Merge with crew
2006-11-20 13:06:04 -08:00
Brendan Cully
83afafe362
mq: add --git option to qimport -r
2006-11-20 13:03:52 -08:00
Thomas Arendsen Hein
0bafb6f99d
Corrected "waiting for lock on repository FOO held by BAR" message.
...
BAR was the error number and not the locker name.
Use repr on BAR, so problems can be detected easier.
2006-11-20 19:55:59 +01:00
Thomas Arendsen Hein
f3d842aee0
Handle locking exceptions if streaming clone can't lock the repo. (Issue324)
2006-11-20 19:41:49 +01:00
Thomas Arendsen Hein
6046bbb871
Don't step into an endless loop when lock file is empty.
2006-11-20 19:36:28 +01:00
Mathieu Clabaut
6971cd5b8c
Issue424: mq patch loses guard when qrenamed
2006-11-19 23:47:19 +01:00
Matt Mackall
303ec3f442
correct remote heads test in prepush
2006-11-19 16:32:36 -06:00
Matt Mackall
9c3965d552
add docstring to reachable
2006-11-19 16:32:36 -06:00