test-convert-bzr.t
286 lines
| 6.3 KiB
| text/troff
|
Tads3Lexer
/ tests / test-convert-bzr.t
|
r12512 | $ . "$TESTDIR/bzr-definitions" | ||
create and rename on the same file in the same step | ||||
$ mkdir test-createandrename | ||||
$ cd test-createandrename | ||||
$ bzr init -q source | ||||
|
r16061 | |||
test empty repo conversion (issue3233) | ||||
$ hg convert source source-hg | ||||
initializing destination source-hg repository | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
back to the rename stuff | ||||
|
r12512 | $ cd source | ||
$ echo a > a | ||||
$ echo c > c | ||||
$ echo e > e | ||||
$ bzr add -q a c e | ||||
$ bzr commit -q -m 'Initial add: a, c, e' | ||||
$ bzr mv a b | ||||
a => b | ||||
$ bzr mv c d | ||||
c => d | ||||
$ bzr mv e f | ||||
e => f | ||||
$ echo a2 >> a | ||||
$ mkdir e | ||||
$ bzr add -q a e | ||||
$ bzr commit -q -m 'rename a into b, create a, rename c into d' | ||||
$ cd .. | ||||
$ hg convert source source-hg | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
1 Initial add: a, c, e | ||||
0 rename a into b, create a, rename c into d | ||||
$ glog -R source-hg | ||||
|
r16060 | o 1@source "rename a into b, create a, rename c into d" files: a b c d e f | ||
|
r12512 | | | ||
|
r16060 | o 0@source "Initial add: a, c, e" files: a c e | ||
|
r12512 | |||
manifest | ||||
$ hg manifest -R source-hg -r tip | ||||
a | ||||
b | ||||
d | ||||
f | ||||
test --rev option | ||||
$ hg convert -r 1 source source-1-hg | ||||
initializing destination source-1-hg repository | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
0 Initial add: a, c, e | ||||
$ glog -R source-1-hg | ||||
|
r16060 | o 0@source "Initial add: a, c, e" files: a c e | ||
|
r12512 | |||
test with filemap | ||||
$ cat > filemap <<EOF | ||||
> exclude a | ||||
> EOF | ||||
$ hg convert --filemap filemap source source-filemap-hg | ||||
initializing destination source-filemap-hg repository | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
1 Initial add: a, c, e | ||||
0 rename a into b, create a, rename c into d | ||||
$ hg -R source-filemap-hg manifest -r tip | ||||
b | ||||
d | ||||
f | ||||
convert from lightweight checkout | ||||
$ bzr checkout --lightweight source source-light | ||||
|
r16060 | $ hg convert -s bzr source-light source-light-hg | ||
|
r12512 | initializing destination source-light-hg repository | ||
warning: lightweight checkouts may cause conversion failures, try with a regular branch instead. | ||||
|
r16060 | $TESTTMP/test-createandrename/source-light does not look like a Bazaar repository | ||
abort: source-light: missing or unsupported repository | ||||
[255] | ||||
|
r12512 | |||
extract timestamps that look just like hg's {date|isodate}: | ||||
yyyy-mm-dd HH:MM zzzz (no seconds!) | ||||
compare timestamps | ||||
$ cd source | ||||
$ bzr log | \ | ||||
> sed '/timestamp/!d;s/.\{15\}\([0-9: -]\{16\}\):.. \(.[0-9]\{4\}\)/\1 \2/' \ | ||||
> > ../bzr-timestamps | ||||
$ cd .. | ||||
$ hg -R source-hg log --template "{date|isodate}\n" > hg-timestamps | ||||
|
r20598 | $ cmp bzr-timestamps hg-timestamps || diff -u bzr-timestamps hg-timestamps | ||
|
r12512 | $ cd .. | ||
merge | ||||
$ mkdir test-merge | ||||
$ cd test-merge | ||||
$ cat > helper.py <<EOF | ||||
> import sys | ||||
> from bzrlib import workingtree | ||||
> wt = workingtree.WorkingTree.open('.') | ||||
> | ||||
> message, stamp = sys.argv[1:] | ||||
> wt.commit(message, timestamp=int(stamp)) | ||||
> EOF | ||||
$ bzr init -q source | ||||
$ cd source | ||||
$ echo content > a | ||||
$ echo content2 > b | ||||
$ bzr add -q a b | ||||
$ bzr commit -q -m 'Initial add' | ||||
$ cd .. | ||||
$ bzr branch -q source source-improve | ||||
$ cd source | ||||
$ echo more >> a | ||||
$ python ../helper.py 'Editing a' 100 | ||||
$ cd ../source-improve | ||||
$ echo content3 >> b | ||||
$ python ../helper.py 'Editing b' 200 | ||||
$ cd ../source | ||||
$ bzr merge -q ../source-improve | ||||
$ bzr commit -q -m 'Merged improve branch' | ||||
$ cd .. | ||||
$ hg convert --datesort source source-hg | ||||
initializing destination source-hg repository | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
3 Initial add | ||||
2 Editing a | ||||
1 Editing b | ||||
0 Merged improve branch | ||||
$ glog -R source-hg | ||||
|
r16060 | o 3@source "Merged improve branch" files: | ||
|
r12512 | |\ | ||
|
r16060 | | o 2@source-improve "Editing b" files: b | ||
|
r12512 | | | | ||
|
r16060 | o | 1@source "Editing a" files: a | ||
|
r12512 | |/ | ||
|
r16060 | o 0@source "Initial add" files: a b | ||
|
r12512 | |||
$ cd .. | ||||
|
r16899 | #if symlink execbit | ||
|
r12512 | symlinks and executable files | ||
$ mkdir test-symlinks | ||||
$ cd test-symlinks | ||||
$ bzr init -q source | ||||
$ cd source | ||||
$ touch program | ||||
$ chmod +x program | ||||
$ ln -s program altname | ||||
$ mkdir d | ||||
$ echo a > d/a | ||||
$ ln -s a syma | ||||
$ bzr add -q altname program syma d/a | ||||
$ bzr commit -q -m 'Initial setup' | ||||
$ touch newprog | ||||
$ chmod +x newprog | ||||
$ rm altname | ||||
$ ln -s newprog altname | ||||
$ chmod -x program | ||||
$ bzr add -q newprog | ||||
$ bzr commit -q -m 'Symlink changed, x bits changed' | ||||
$ cd .. | ||||
$ hg convert source source-hg | ||||
initializing destination source-hg repository | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
1 Initial setup | ||||
0 Symlink changed, x bits changed | ||||
$ manifest source-hg 0 | ||||
% manifest of 0 | ||||
644 @ altname | ||||
644 d/a | ||||
755 * program | ||||
644 @ syma | ||||
$ manifest source-hg tip | ||||
% manifest of tip | ||||
644 @ altname | ||||
644 d/a | ||||
755 * newprog | ||||
644 program | ||||
644 @ syma | ||||
test the symlinks can be recreated | ||||
|
r16899 | $ cd source-hg | ||
|
r12512 | $ hg up | ||
5 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg cat syma; echo | ||||
a | ||||
|
r16899 | $ cd ../.. | ||
#endif | ||||
|
r12512 | |||
|
r16060 | Multiple branches | ||
$ bzr init-repo -q --no-trees repo | ||||
$ bzr init -q repo/trunk | ||||
$ bzr co repo/trunk repo-trunk | ||||
$ cd repo-trunk | ||||
$ echo a > a | ||||
|
r17034 | $ bzr add -q a | ||
$ bzr ci -qm adda | ||||
|
r16062 | $ bzr tag trunk-tag | ||
Created tag trunk-tag. | ||||
|
r16060 | $ bzr switch -b branch | ||
Tree is up to date at revision 1. | ||||
Switched to branch: *repo/branch/ (glob) | ||||
|
r17097 | $ sleep 1 | ||
|
r16060 | $ echo b > b | ||
|
r17034 | $ bzr add -q b | ||
$ bzr ci -qm addb | ||||
|
r16062 | $ bzr tag branch-tag | ||
Created tag branch-tag. | ||||
|
r16060 | $ bzr switch --force ../repo/trunk | ||
Updated to revision 1. | ||||
Switched to branch: */repo/trunk/ (glob) | ||||
|
r17097 | $ sleep 1 | ||
|
r16060 | $ echo a >> a | ||
|
r17034 | $ bzr ci -qm changea | ||
|
r16060 | $ cd .. | ||
$ hg convert --datesort repo repo-bzr | ||||
initializing destination repo-bzr repository | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
2 adda | ||||
1 addb | ||||
0 changea | ||||
|
r16062 | updating tags | ||
|
r16060 | $ (cd repo-bzr; glog) | ||
|
r16062 | o 3@default "update tags" files: .hgtags | ||
| | ||||
|
r16060 | o 2@default "changea" files: a | ||
| | ||||
| o 1@branch "addb" files: b | ||||
|/ | ||||
o 0@default "adda" files: a | ||||
|
r16062 | |||
Test tags (converted identifiers are not stable because bzr ones are | ||||
not and get incorporated in extra fields). | ||||
$ hg -R repo-bzr tags | ||||
tip 3:* (glob) | ||||
branch-tag 1:* (glob) | ||||
trunk-tag 0:* (glob) | ||||
|
r16099 | |||
Nested repositories (issue3254) | ||||
$ bzr init-repo -q --no-trees repo/inner | ||||
$ bzr init -q repo/inner/trunk | ||||
$ bzr co repo/inner/trunk inner-trunk | ||||
$ cd inner-trunk | ||||
$ echo b > b | ||||
|
r17034 | $ bzr add -q b | ||
|
r16099 | $ bzr ci -qm addb | ||
$ cd .. | ||||
$ hg convert --datesort repo noinner-bzr | ||||
initializing destination noinner-bzr repository | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
2 adda | ||||
1 addb | ||||
0 changea | ||||
updating tags | ||||