2018-01-23 23:09:16 +03:00
|
|
|
$ . helpers-usechg.sh
|
|
|
|
|
2014-08-06 20:43:59 +04:00
|
|
|
#require svn svn-bindings
|
2010-09-21 20:40:33 +04:00
|
|
|
|
2011-03-01 19:01:17 +03:00
|
|
|
$ cat >> $HGRCPATH <<EOF
|
2010-09-21 20:40:33 +04:00
|
|
|
> [extensions]
|
2012-08-08 20:10:37 +04:00
|
|
|
> convert =
|
2010-09-21 20:40:33 +04:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ svnadmin create svn-repo
|
|
|
|
$ svnadmin load -q svn-repo < "$TESTDIR/svn/move.svndump"
|
2012-06-26 05:35:22 +04:00
|
|
|
$ SVNREPOPATH=`pwd`/svn-repo
|
|
|
|
#if windows
|
2014-10-15 23:35:59 +04:00
|
|
|
$ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
|
2012-06-26 05:35:22 +04:00
|
|
|
#else
|
2014-10-15 23:35:59 +04:00
|
|
|
$ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
|
2012-06-26 05:35:22 +04:00
|
|
|
#endif
|
2010-09-21 20:40:33 +04:00
|
|
|
|
|
|
|
Convert trunk and branches
|
|
|
|
|
2012-06-26 05:35:22 +04:00
|
|
|
$ hg convert --datesort "$SVNREPOURL"/subproject A-hg
|
2010-09-21 20:40:33 +04:00
|
|
|
initializing destination A-hg repository
|
|
|
|
scanning source...
|
|
|
|
sorting...
|
|
|
|
converting...
|
|
|
|
13 createtrunk
|
|
|
|
12 moved1
|
|
|
|
11 moved1
|
|
|
|
10 moved2
|
|
|
|
9 changeb and rm d2
|
|
|
|
8 changeb and rm d2
|
|
|
|
7 moved1again
|
|
|
|
6 moved1again
|
|
|
|
5 copyfilefrompast
|
|
|
|
4 copydirfrompast
|
|
|
|
3 add d3
|
|
|
|
2 copy dir and remove subdir
|
|
|
|
1 add d4old
|
|
|
|
0 rename d4old into d4new
|
|
|
|
|
|
|
|
$ cd A-hg
|
2013-11-22 22:14:17 +04:00
|
|
|
$ hg log -G --template '{rev} {desc|firstline} files: {files}\n'
|
2010-09-21 20:40:33 +04:00
|
|
|
o 13 rename d4old into d4new files: d4new/g d4old/g
|
|
|
|
|
|
|
|
|
o 12 add d4old files: d4old/g
|
|
|
|
|
|
|
|
|
o 11 copy dir and remove subdir files: d3/d31/e d4/d31/e d4/f
|
|
|
|
|
|
|
|
|
o 10 add d3 files: d3/d31/e d3/f
|
|
|
|
|
|
|
|
|
o 9 copydirfrompast files: d2/d
|
|
|
|
|
|
|
|
|
o 8 copyfilefrompast files: d
|
|
|
|
|
|
|
|
|
o 7 moved1again files: d1/b d1/c
|
|
|
|
|
|
|
|
|
| o 6 moved1again files:
|
|
|
|
| |
|
|
|
|
o | 5 changeb and rm d2 files: d1/b d2/d
|
|
|
|
| |
|
|
|
|
| o 4 changeb and rm d2 files: b
|
|
|
|
| |
|
|
|
|
o | 3 moved2 files: d2/d
|
|
|
|
| |
|
|
|
|
o | 2 moved1 files: d1/b d1/c
|
|
|
|
| |
|
|
|
|
| o 1 moved1 files: b c
|
|
|
|
|
|
|
|
|
o 0 createtrunk files:
|
|
|
|
|
|
|
|
|
|
|
|
Check move copy records
|
|
|
|
|
|
|
|
$ hg st --rev 12:13 --copies
|
|
|
|
A d4new/g
|
|
|
|
d4old/g
|
|
|
|
R d4old/g
|
|
|
|
|
|
|
|
Check branches
|
|
|
|
|
2019-02-07 01:10:40 +03:00
|
|
|
$ hg log -r 'all()' -T '{extras}\n' | sed 's/convert_revision=.*//' | sort -u
|
|
|
|
branch=d1
|
|
|
|
branch=default
|
2010-09-21 20:40:33 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
$ mkdir test-replace
|
|
|
|
$ cd test-replace
|
|
|
|
$ svnadmin create svn-repo
|
|
|
|
$ svnadmin load -q svn-repo < "$TESTDIR/svn/replace.svndump"
|
|
|
|
|
|
|
|
Convert files being replaced by directories
|
|
|
|
|
|
|
|
$ hg convert svn-repo hg-repo
|
|
|
|
initializing destination hg-repo repository
|
|
|
|
scanning source...
|
|
|
|
sorting...
|
|
|
|
converting...
|
2010-11-29 22:13:11 +03:00
|
|
|
6 initial
|
|
|
|
5 clobber symlink
|
|
|
|
4 clobber1
|
|
|
|
3 clobber2
|
|
|
|
2 adddb
|
2012-12-14 02:15:51 +04:00
|
|
|
1 clobberdir
|
|
|
|
0 branch
|
2010-09-21 20:40:33 +04:00
|
|
|
|
|
|
|
$ cd hg-repo
|
|
|
|
|
|
|
|
Manifest before
|
|
|
|
|
|
|
|
$ hg -v manifest -r 1
|
|
|
|
644 a
|
|
|
|
644 d/b
|
2010-11-29 22:13:11 +03:00
|
|
|
644 d2/a
|
2010-09-21 20:40:33 +04:00
|
|
|
644 @ dlink
|
|
|
|
644 @ dlink2
|
|
|
|
644 dlink3
|
|
|
|
|
|
|
|
Manifest after clobber1
|
|
|
|
|
|
|
|
$ hg -v manifest -r 2
|
|
|
|
644 a/b
|
|
|
|
644 d/b
|
2010-11-29 22:13:11 +03:00
|
|
|
644 d2/a
|
2010-09-21 20:40:33 +04:00
|
|
|
644 dlink/b
|
|
|
|
644 @ dlink2
|
|
|
|
644 dlink3
|
|
|
|
|
|
|
|
Manifest after clobber2
|
|
|
|
|
|
|
|
$ hg -v manifest -r 3
|
|
|
|
644 a/b
|
|
|
|
644 d/b
|
2010-11-29 22:13:11 +03:00
|
|
|
644 d2/a
|
|
|
|
644 dlink/b
|
|
|
|
644 @ dlink2
|
|
|
|
644 @ dlink3
|
|
|
|
|
|
|
|
Manifest after clobberdir
|
|
|
|
|
|
|
|
$ hg -v manifest -r 6
|
|
|
|
644 a/b
|
|
|
|
644 d/b
|
|
|
|
644 d2/a
|
|
|
|
644 d2/c
|
2010-09-21 20:40:33 +04:00
|
|
|
644 dlink/b
|
|
|
|
644 @ dlink2
|
|
|
|
644 @ dlink3
|
|
|
|
|
|
|
|
Try updating
|
|
|
|
|
|
|
|
$ hg up -qC default
|
|
|
|
$ cd ..
|
|
|
|
|
2014-09-10 19:01:47 +04:00
|
|
|
Test convert progress bar
|
2010-09-21 20:40:33 +04:00
|
|
|
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
> [progress]
|
2018-03-21 23:41:26 +03:00
|
|
|
> debug = true
|
2010-09-21 20:40:33 +04:00
|
|
|
> EOF
|
|
|
|
|
2012-10-10 03:37:54 +04:00
|
|
|
$ hg convert svn-repo hg-progress
|
2010-09-21 20:40:33 +04:00
|
|
|
initializing destination hg-progress repository
|
|
|
|
scanning source...
|
2018-03-21 23:49:51 +03:00
|
|
|
progress: scanning: 1/7 revisions (14.29%)
|
|
|
|
progress: scanning: 2/7 revisions (28.57%)
|
|
|
|
progress: scanning: 3/7 revisions (42.86%)
|
|
|
|
progress: scanning: 4/7 revisions (57.14%)
|
|
|
|
progress: scanning: 5/7 revisions (71.43%)
|
|
|
|
progress: scanning: 6/7 revisions (85.71%)
|
|
|
|
progress: scanning: 7/7 revisions (100.00%)
|
|
|
|
progress: scanning (end)
|
2010-09-21 20:40:33 +04:00
|
|
|
sorting...
|
|
|
|
converting...
|
2010-11-29 22:13:11 +03:00
|
|
|
6 initial
|
2018-03-21 23:49:51 +03:00
|
|
|
progress: converting: 0/7 revisions (0.00%)
|
|
|
|
progress: getting files: a 1/6 files (16.67%)
|
|
|
|
progress: getting files: d/b 2/6 files (33.33%)
|
|
|
|
progress: getting files: d2/a 3/6 files (50.00%)
|
|
|
|
progress: getting files: dlink 4/6 files (66.67%)
|
|
|
|
progress: getting files: dlink2 5/6 files (83.33%)
|
|
|
|
progress: getting files: dlink3 6/6 files (100.00%)
|
|
|
|
progress: getting files (end)
|
2010-11-29 22:13:11 +03:00
|
|
|
5 clobber symlink
|
2018-03-21 23:49:51 +03:00
|
|
|
progress: converting: 1/7 revisions (14.29%)
|
|
|
|
progress: scanning paths: /trunk/dlink3 0/1 paths (0.00%)
|
|
|
|
progress: scanning paths (end)
|
|
|
|
progress: getting files: dlink3 1/1 files (100.00%)
|
|
|
|
progress: getting files (end)
|
2010-11-29 22:13:11 +03:00
|
|
|
4 clobber1
|
2018-03-21 23:49:51 +03:00
|
|
|
progress: converting: 2/7 revisions (28.57%)
|
|
|
|
progress: scanning paths: /trunk/a 0/2 paths (0.00%)
|
|
|
|
progress: scanning paths: /trunk/dlink 1/2 paths (50.00%)
|
|
|
|
progress: scanning paths (end)
|
|
|
|
progress: getting files: a 1/4 files (25.00%)
|
|
|
|
progress: getting files: dlink 2/4 files (50.00%)
|
|
|
|
progress: getting files: a/b 3/4 files (75.00%)
|
|
|
|
progress: getting files: dlink/b 4/4 files (100.00%)
|
|
|
|
progress: getting files (end)
|
2010-11-29 22:13:11 +03:00
|
|
|
3 clobber2
|
2018-03-21 23:49:51 +03:00
|
|
|
progress: converting: 3/7 revisions (42.86%)
|
|
|
|
progress: scanning paths: /trunk/dlink3 0/1 paths (0.00%)
|
|
|
|
progress: scanning paths (end)
|
|
|
|
progress: getting files: dlink3 1/1 files (100.00%)
|
|
|
|
progress: getting files (end)
|
2010-11-29 22:13:11 +03:00
|
|
|
2 adddb
|
2018-03-21 23:49:51 +03:00
|
|
|
progress: converting: 4/7 revisions (57.14%)
|
|
|
|
progress: scanning paths: /trunk/d2/b 0/1 paths (0.00%)
|
|
|
|
progress: scanning paths (end)
|
|
|
|
progress: getting files: d2/b 1/1 files (100.00%)
|
|
|
|
progress: getting files (end)
|
2012-12-14 02:15:51 +04:00
|
|
|
1 clobberdir
|
2018-03-21 23:49:51 +03:00
|
|
|
progress: converting: 5/7 revisions (71.43%)
|
|
|
|
progress: scanning paths: /trunk/d2 0/1 paths (0.00%)
|
|
|
|
progress: scanning paths (end)
|
|
|
|
progress: getting files: a/b 1/8 files (12.50%)
|
|
|
|
progress: getting files: d/b 2/8 files (25.00%)
|
|
|
|
progress: getting files: d2/a 3/8 files (37.50%)
|
|
|
|
progress: getting files: d2/b 4/8 files (50.00%)
|
|
|
|
progress: getting files: dlink/b 5/8 files (62.50%)
|
|
|
|
progress: getting files: dlink2 6/8 files (75.00%)
|
|
|
|
progress: getting files: dlink3 7/8 files (87.50%)
|
|
|
|
progress: getting files: d2/c 8/8 files (100.00%)
|
|
|
|
progress: getting files (end)
|
2012-12-14 02:15:51 +04:00
|
|
|
0 branch
|
2018-03-21 23:49:51 +03:00
|
|
|
progress: converting: 6/7 revisions (85.71%)
|
|
|
|
progress: scanning paths: /branches/branch 0/3 paths (0.00%)
|
|
|
|
progress: scanning paths: /branches/branch/d2/b 1/3 paths (33.33%)
|
|
|
|
progress: scanning paths: /branches/branch/d2/c 2/3 paths (66.67%)
|
|
|
|
progress: scanning paths (end)
|
|
|
|
progress: getting files: a/b 1/8 files (12.50%)
|
|
|
|
progress: getting files: d/b 2/8 files (25.00%)
|
|
|
|
progress: getting files: d2/a 3/8 files (37.50%)
|
|
|
|
progress: getting files: d2/b 4/8 files (50.00%)
|
|
|
|
progress: getting files: dlink/b 5/8 files (62.50%)
|
|
|
|
progress: getting files: dlink2 6/8 files (75.00%)
|
|
|
|
progress: getting files: dlink3 7/8 files (87.50%)
|
|
|
|
progress: getting files: d2/c 8/8 files (100.00%)
|
|
|
|
progress: getting files (end)
|
|
|
|
progress: converting (end)
|
2012-06-11 03:40:51 +04:00
|
|
|
|
|
|
|
$ cd ..
|