Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-copy2 @ 5378:8a2915f57dfc
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.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 04 Oct 2007 23:21:37 -0300 |
parents | 44e17f5029d0 |
children |
line wrap: on
line source
#!/bin/sh hg init echo foo > foo echo "# should fail - foo is not managed" hg mv foo bar hg st -A hg add foo echo "# dry-run; print a warning that this is not a real copy; foo is added" hg mv --dry-run foo bar hg st -A echo "# should print a warning that this is not a real copy; bar is added" hg mv foo bar hg st -A echo "# should print a warning that this is not a real copy; foo is added" hg cp bar foo hg rm -f bar rm bar hg st -A hg commit -m1 -d"0 0" echo "# dry-run; should show that foo is clean" hg copy --dry-run foo bar hg st -A echo "# should show copy" hg copy foo bar hg st -C echo "# shouldn't show copy" hg commit -m2 -d"0 0" hg st -C echo "# should match" hg debugindex .hg/store/data/foo.i hg debugrename bar echo bleah > foo echo quux > bar hg commit -m3 -d"0 0" echo "# should not be renamed" hg debugrename bar hg copy -f foo bar echo "# should show copy" hg st -C hg commit -m3 -d"0 0" echo "# should show no parents for tip" hg debugindex .hg/store/data/bar.i echo "# should match" hg debugindex .hg/store/data/foo.i hg debugrename bar echo "# should show no copies" hg st -C echo "# copy --after on an added file" cp bar baz hg add baz hg cp -A bar baz hg st -C echo "# foo was clean:" hg st -AC foo echo "# but it's considered modified after a copy --after --force" hg copy -Af bar foo hg st -AC foo exit 0