Mercurial > hg
changeset 12148:0a0592f8e11a
tests: unify test-convert-hg-startrev.
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Thu, 02 Sep 2010 14:58:47 +0200 |
| parents | 2b171fe378c0 |
| children | 3213e56d63aa |
| files | tests/test-convert-hg-startrev tests/test-convert-hg-startrev.out tests/test-convert-hg-startrev.t |
| diffstat | 3 files changed, 152 insertions(+), 149 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-hg-startrev Thu Sep 02 16:29:04 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -#!/bin/sh - -echo '[extensions]' >> $HGRCPATH -echo 'graphlog =' >> $HGRCPATH -echo 'convert =' >> $HGRCPATH - -glog() -{ - hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n' -} - -hg init source -cd source - -echo a > a -echo b > b -hg ci -d '0 0' -qAm '0: add a b' -echo c > c -hg ci -d '1 0' -qAm '1: add c' -hg copy a e -echo b >> b -hg ci -d '2 0' -qAm '2: copy e from a, change b' -hg up -C 0 -echo a >> a -hg ci -d '3 0' -qAm '3: change a' -hg merge -hg copy b d -hg ci -d '4 0' -qAm '4: merge 2 and 3, copy d from b' -echo a >> a -hg ci -d '5 0' -qAm '5: change a' -cd .. - -echo % convert from null revision -hg convert --config convert.hg.startrev=null source empty -glog empty - -echo % convert from zero revision -hg convert --config convert.hg.startrev=0 source full -glog full - -echo % convert from merge parent -hg convert --config convert.hg.startrev=1 source conv1 -glog conv1 -cd conv1 -echo % check copy preservation -hg log --follow --copies e -echo % check copy removal on missing parent -hg log --follow --copies d -hg cat -r tip a b -hg -q verify -cd .. - -echo % convert from merge -hg convert --config convert.hg.startrev=4 source conv4 -glog conv4 -cd conv4 -hg up -C -hg cat -r tip a b -hg -q verify -cd .. -
--- a/tests/test-convert-hg-startrev.out Thu Sep 02 16:29:04 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -1 files updated, 0 files merged, 2 files removed, 0 files unresolved -merging a and e to e -2 files updated, 1 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -% convert from null revision -initializing destination empty repository -scanning source... -sorting... -converting... -% convert from zero revision -initializing destination full repository -scanning source... -sorting... -converting... -5 0: add a b -4 1: add c -3 2: copy e from a, change b -2 3: change a -1 4: merge 2 and 3, copy d from b -0 5: change a -o 5 "5: change a" files: a -| -o 4 "4: merge 2 and 3, copy d from b" files: d e -|\ -| o 3 "3: change a" files: a -| | -o | 2 "2: copy e from a, change b" files: b e -| | -o | 1 "1: add c" files: c -|/ -o 0 "0: add a b" files: a b - -% convert from merge parent -initializing destination conv1 repository -scanning source... -sorting... -converting... -3 1: add c -2 2: copy e from a, change b -1 4: merge 2 and 3, copy d from b -0 5: change a -o 3 "5: change a" files: a -| -o 2 "4: merge 2 and 3, copy d from b" files: a d e -| -o 1 "2: copy e from a, change b" files: b e -| -o 0 "1: add c" files: a b c - -% check copy preservation -changeset: 2:d67b1d48a835 -user: test -date: Thu Jan 01 00:00:04 1970 +0000 -summary: 4: merge 2 and 3, copy d from b - -changeset: 1:462c431cf47d -user: test -date: Thu Jan 01 00:00:02 1970 +0000 -summary: 2: copy e from a, change b - -% check copy removal on missing parent -changeset: 2:d67b1d48a835 -user: test -date: Thu Jan 01 00:00:04 1970 +0000 -summary: 4: merge 2 and 3, copy d from b - -a -a -a -b -b -% convert from merge -initializing destination conv4 repository -scanning source... -sorting... -converting... -1 4: merge 2 and 3, copy d from b -0 5: change a -o 1 "5: change a" files: a -| -o 0 "4: merge 2 and 3, copy d from b" files: a b c d e - -5 files updated, 0 files merged, 0 files removed, 0 files unresolved -a -a -a -b -b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-convert-hg-startrev.t Thu Sep 02 14:58:47 2010 +0200 @@ -0,0 +1,152 @@ + + $ cat > $HGRCPATH <<EOF + > [extensions] + > graphlog = + > convert = + > EOF + + $ glog() + > { + > hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n' + > } + + $ hg init source + $ cd source + + $ echo a > a + $ echo b > b + $ hg ci -d '0 0' -qAm '0: add a b' + $ echo c > c + $ hg ci -d '1 0' -qAm '1: add c' + $ hg copy a e + $ echo b >> b + $ hg ci -d '2 0' -qAm '2: copy e from a, change b' + $ hg up -C 0 + 1 files updated, 0 files merged, 2 files removed, 0 files unresolved + $ echo a >> a + $ hg ci -d '3 0' -qAm '3: change a' + $ hg merge + merging a and e to e + 2 files updated, 1 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg copy b d + $ hg ci -d '4 0' -qAm '4: merge 2 and 3, copy d from b' + $ echo a >> a + $ hg ci -d '5 0' -qAm '5: change a' + $ cd .. + +Convert from null revision + + $ hg convert --config convert.hg.startrev=null source empty + initializing destination empty repository + scanning source... + sorting... + converting... + + $ glog empty + +Convert from zero revision + + $ hg convert --config convert.hg.startrev=0 source full + initializing destination full repository + scanning source... + sorting... + converting... + 5 0: add a b + 4 1: add c + 3 2: copy e from a, change b + 2 3: change a + 1 4: merge 2 and 3, copy d from b + 0 5: change a + + $ glog full + o 5 "5: change a" files: a + | + o 4 "4: merge 2 and 3, copy d from b" files: d e + |\ + | o 3 "3: change a" files: a + | | + o | 2 "2: copy e from a, change b" files: b e + | | + o | 1 "1: add c" files: c + |/ + o 0 "0: add a b" files: a b + +Convert from merge parent + + $ hg convert --config convert.hg.startrev=1 source conv1 + initializing destination conv1 repository + scanning source... + sorting... + converting... + 3 1: add c + 2 2: copy e from a, change b + 1 4: merge 2 and 3, copy d from b + 0 5: change a + + $ glog conv1 + o 3 "5: change a" files: a + | + o 2 "4: merge 2 and 3, copy d from b" files: a d e + | + o 1 "2: copy e from a, change b" files: b e + | + o 0 "1: add c" files: a b c + + $ cd conv1 + +Check copy preservation + + $ hg log --follow --copies e + changeset: 2:d67b1d48a835 + user: test + date: Thu Jan 01 00:00:04 1970 +0000 + summary: 4: merge 2 and 3, copy d from b + + changeset: 1:462c431cf47d + user: test + date: Thu Jan 01 00:00:02 1970 +0000 + summary: 2: copy e from a, change b + +Check copy removal on missing parent + + $ hg log --follow --copies d + changeset: 2:d67b1d48a835 + user: test + date: Thu Jan 01 00:00:04 1970 +0000 + summary: 4: merge 2 and 3, copy d from b + + $ hg cat -r tip a b + a + a + a + b + b + $ hg -q verify + $ cd .. + +Convert from merge + + $ hg convert --config convert.hg.startrev=4 source conv4 + initializing destination conv4 repository + scanning source... + sorting... + converting... + 1 4: merge 2 and 3, copy d from b + 0 5: change a + $ glog conv4 + o 1 "5: change a" files: a + | + o 0 "4: merge 2 and 3, copy d from b" files: a b c d e + + $ cd conv4 + $ hg up -C + 5 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg cat -r tip a b + a + a + a + b + b + $ hg -q verify + $ cd ..