##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert: add a mode where mercurial_sink skips empty revisions....
convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4679:826659bd default
r5378:8a2915f5 default
Show More
test-git-import.out
65 lines | 916 B | text/plain | TextLexer
/ tests / test-git-import.out
History | Source | Raw |Copy content |Copy permalink
Brendan Cully
Tests for git import
 r2864 % new file
applying patch from stdin
Brendan Cully
test for git empty new files
 r3589 % new empty file
applying patch from stdin
empty
Brendan Cully
Tests for git import
 r2864 % chmod +x
applying patch from stdin
% copy
applying patch from stdin
a
a
% rename
applying patch from stdin
copyx
Brendan Cully
test for git empty new files
 r3589 empty
Brendan Cully
Tests for git import
 r2864 new
rename
% delete
applying patch from stdin
Brendan Cully
test for git empty new files
 r3589 empty
Brendan Cully
Tests for git import
 r2864 new
rename
% regular diff
applying patch from stdin
% copy and modify
applying patch from stdin
a
a
b
a
a
% rename and modify
applying patch from stdin
a
a
b
c
a
Alexis S. L. Carvalho
handle git patches that rename a file to more than one destination
 r3701 % one file renamed multiple times
applying patch from stdin
9 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2)
rename3
rename3-2
a
a
b
c
a
a
a
b
c
a
Alexis S. L. Carvalho
handle files with both git binary patches and copy/rename ops
 r3716 % binary files and regular patch hunks
applying patch from stdin
foo
045c85ba38952325e126c70962cc0f9d9077bc67 644 binary
Alexis S. L. Carvalho
handle files with more than one git binary patch
 r3717 % many binary files
applying patch from stdin
045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1
a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2
Alexis S. L. Carvalho
git patches: correct handling of filenames with spaces...
 r4679 % filenames with spaces
applying patch from stdin
foo