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
7d0dc1d604
make hg commit <dirname> work again
2006-11-21 20:00:15 -02:00
Matt Mackall
a8fff7f220
imported patch collision
2006-12-04 17:10:31 -06:00
Matt Mackall
2356030286
imported patch folding
2006-12-04 17:10:29 -06:00
Matt Mackall
880daa82ce
Make quoting in test-encoding simpler
2006-12-04 14:32:02 -06:00
Matt Mackall
d128a67002
update test-debugcomplete
2006-12-04 01:21:53 -06:00
Matt Mackall
cdbe57fc80
hgweb: report detected character set
...
Add comments on overriding charset to CGI scripts
2006-12-03 18:47:05 -06:00
Matt Mackall
18df2fdfd7
test-encoding: copy a bundle from TESTDIR rather than constructing one
2006-12-03 17:28:58 -06:00
Matt Mackall
1300ae1a67
Hex-encode ! in test-encoding printf
...
Naked ! tends to confuse shells
2006-12-03 16:51:50 -06:00
Matt Mackall
37b816aaf1
Add output for encoding test
2006-12-03 16:31:25 -06:00
Matt Mackall
0849854893
Add a charset encoding test case
2006-12-03 16:16:33 -06:00
Matt Mackall
ab12bf1889
tests: set a default encoding for running tests (ASCII)
2006-12-03 16:16:33 -06:00
Matt Mackall
205ca192c3
Add documentation for charset encoding options
2006-12-03 16:16:33 -06:00
Matt Mackall
6b3e2955b8
Add global options for setting encoding and encodingmode
2006-12-03 16:16:33 -06:00
Matt Mackall
aaf36f881a
Handle transcoding of branch names
2006-12-03 16:16:33 -06:00
Matt Mackall
299a930c93
Handle transcoding of tags
2006-12-03 16:16:33 -06:00
Matt Mackall
82c5ca8fac
Handle transcoding of username and description in changelog
2006-12-03 16:16:33 -06:00
Matt Mackall
3982f645e8
Add functions for transcoding and manipulating multibyte strings
2006-12-03 16:16:33 -06:00
Matt Mackall
8b091a9c1d
Add encoding detection
2006-12-03 16:16:33 -06: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
