Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-transplant @ 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 | 75313c36aa04 |
| children | e3a0c092b4e2 |
line wrap: on
line source
#!/bin/sh cat <<EOF >> $HGRCPATH [extensions] transplant= EOF hg init t cd t echo r1 > r1 hg ci -Amr1 -d'0 0' echo r2 > r2 hg ci -Amr2 -d'1 0' hg up 0 echo b1 > b1 hg ci -Amb1 -d '0 0' echo b2 > b2 hg ci -Amb2 -d '1 0' echo b3 > b3 hg ci -Amb3 -d '2 0' hg log --template '{rev} {parents} {desc}\n' hg clone . ../rebase cd ../rebase hg up -C 1 echo '% rebase b onto r1' hg transplant -a -b tip hg log --template '{rev} {parents} {desc}\n' hg clone ../t ../prune cd ../prune hg up -C 1 echo '% rebase b onto r1, skipping b2' hg transplant -a -b tip -p 3 hg log --template '{rev} {parents} {desc}\n' echo '% remote transplant' hg clone -r 1 ../t ../remote cd ../remote hg transplant --log -s ../t 2 4 hg log --template '{rev} {parents} {desc}\n' echo '% skip previous transplants' hg transplant -s ../t -a -b 4 hg log --template '{rev} {parents} {desc}\n' echo '% skip local changes transplanted to the source' echo b4 > b4 hg ci -Amb4 -d '3 0' hg clone ../t ../pullback cd ../pullback hg transplant -s ../remote -a -b tip echo '% remote transplant with pull' hg -R ../t serve -p 20062 -d --pid-file=../t.pid cat ../t.pid >> $DAEMON_PIDS hg clone -r 0 ../t ../rp cd ../rp hg transplant -s http://localhost:20062/ 2 4 hg log --template '{rev} {parents} {desc}\n' echo '% transplant --continue' hg init ../tc cd ../tc cat <<EOF > foo foo bar baz EOF echo toremove > toremove hg ci -Amfoo -d '0 0' cat <<EOF > foo foo2 bar2 baz2 EOF rm toremove echo added > added hg ci -Amfoo2 -d '0 0' echo bar > bar hg ci -Ambar -d '0 0' echo bar2 >> bar hg ci -mbar2 -d '0 0' hg up 0 echo foobar > foo hg ci -mfoobar -d '0 0' hg transplant 1:3 # transplant -c shouldn't use an old changeset hg up -C hg transplant 1 hg transplant --continue hg transplant 1:3 hg locate