facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity
32da3b0259
sapling/tests/test-convert-svn-move.t

242 lines
6.2 KiB
Perl
Raw Normal View History

test-helpers: add a helper to run test using chg Summary: The helper could be used in individual tests to enable chg if chg exists. This allows us to have more precise control on what tests to use chg instead of using a global flag in run-tests.py. This makes certain tests containing many hg commands much faster. For example, `test-revset.t` took 99 seconds before: % ./run-tests.py test-revset.t --time . # Ran 1 tests, 0 skipped, 0 failed. # Producing time report start end cuser csys real Test 0.000 99.990 86.410 12.000 99.990 test-revset.t And 10 seconds after: % ./run-tests.py test-revset.t --time . # Ran 1 tests, 0 skipped, 0 failed. # Producing time report start end cuser csys real Test 0.000 10.080 0.380 0.130 10.080 test-revset.t Also enable it for some other tests. Note the whitelist is not complete. We probably want to whitelist more tests in the future. The feature could be opted out by deleting `contrib/chg/chg`. Reviewed By: phillco Differential Revision: D6767036 fbshipit-source-id: 8220cf408aa198d5d8e2ca5127ca60e2070d3444
2018-01-23 23:09:16 +03:00
$ . helpers-usechg.sh
tests: replace exit 80 with #require
2014-08-06 20:43:59 +04:00
#require svn svn-bindings
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
tests: don't overwrite HGRCPATH Overwriting instead of appending to the file removes the [defaults] section put into the file by run-tests.py. It also defeats the --inotify option to run-tests.py. (Nothing was broken yet, but the lack of -d "0 0" cause changeset hashes to change unexpectedly in a test case I was editing.)
2011-03-01 19:01:17 +03:00
$ cat >> $HGRCPATH <<EOF
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
> [extensions]
check-code: fix check for trailing whitespace on continued lines too The tests in test-annotate.t and test-import-git.t that relied on trailing space in a file created by a here string is now masked by a literal 'EOL' string that is removed.
2012-08-08 20:10:37 +04:00
> convert =
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
> EOF
$ svnadmin create svn-repo
$ svnadmin load -q svn-repo < "$TESTDIR/svn/move.svndump"
tests: cleanup of svn url handling The subversion tests used different tricks to create properly encoded URLs, partly due to partial support for different ways of running the tests on windows. Now we only need/support one way of running the tests on windows. Windows URLs should look like 'file:///c:/foo%20bar' and on Unix platforms like 'file:///tmp/baz'. 'pwd' in the test framework will on Windows emit paths like 'c:/foo bar'. Explicit handling of backslashes in paths is thus no longer needed and is removed. Paths on windows do however need an extra '/' compared to other platforms. This change makes test-subrepo-svn.t pass on windows with msys. Other tests might need more work.
2012-06-26 05:35:22 +04:00
$ SVNREPOPATH=`pwd`/svn-repo
#if windows
tests: use $PYTHON instead of hardcoding python This makes running the testsuite with pypy possible.
2014-10-15 23:35:59 +04:00
$ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
tests: cleanup of svn url handling The subversion tests used different tricks to create properly encoded URLs, partly due to partial support for different ways of running the tests on windows. Now we only need/support one way of running the tests on windows. Windows URLs should look like 'file:///c:/foo%20bar' and on Unix platforms like 'file:///tmp/baz'. 'pwd' in the test framework will on Windows emit paths like 'c:/foo bar'. Explicit handling of backslashes in paths is thus no longer needed and is removed. Paths on windows do however need an extra '/' compared to other platforms. This change makes test-subrepo-svn.t pass on windows with msys. Other tests might need more work.
2012-06-26 05:35:22 +04:00
#else
tests: use $PYTHON instead of hardcoding python This makes running the testsuite with pypy possible.
2014-10-15 23:35:59 +04:00
$ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
tests: cleanup of svn url handling The subversion tests used different tricks to create properly encoded URLs, partly due to partial support for different ways of running the tests on windows. Now we only need/support one way of running the tests on windows. Windows URLs should look like 'file:///c:/foo%20bar' and on Unix platforms like 'file:///tmp/baz'. 'pwd' in the test framework will on Windows emit paths like 'c:/foo bar'. Explicit handling of backslashes in paths is thus no longer needed and is removed. Paths on windows do however need an extra '/' compared to other platforms. This change makes test-subrepo-svn.t pass on windows with msys. Other tests might need more work.
2012-06-26 05:35:22 +04:00
#endif
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
Convert trunk and branches
tests: cleanup of svn url handling The subversion tests used different tricks to create properly encoded URLs, partly due to partial support for different ways of running the tests on windows. Now we only need/support one way of running the tests on windows. Windows URLs should look like 'file:///c:/foo%20bar' and on Unix platforms like 'file:///tmp/baz'. 'pwd' in the test framework will on Windows emit paths like 'c:/foo bar'. Explicit handling of backslashes in paths is thus no longer needed and is removed. Paths on windows do however need an extra '/' compared to other platforms. This change makes test-subrepo-svn.t pass on windows with msys. Other tests might need more work.
2012-06-26 05:35:22 +04:00
$ hg convert --datesort "$SVNREPOURL"/subproject A-hg
tests: unify test-convert-svn-*
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
tests: don't load unnecessary graphlog extension Since graphlog is in core, we can use 'hg log -G' instead.
2013-11-22 22:14:17 +04:00
$ hg log -G --template '{rev} {desc|firstline} files: {files}\n'
tests: unify test-convert-svn-*
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
$ hg branches
tests: various fixes for new unified test pattern format
2010-09-23 03:20:47 +04:00
default 13:* (glob)
d1 6:* (glob)
tests: unify test-convert-svn-*
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...
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
2010-11-29 22:13:11 +03:00
6 initial
5 clobber symlink
4 clobber1
3 clobber2
2 adddb
convert: make toposort order stable when multiple orderings are possible The output of some tests are changed. Not necessarily to the better, just other valid permutations.
2012-12-14 02:15:51 +04:00
1 clobberdir
0 branch
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
$ cd hg-repo
Manifest before
$ hg -v manifest -r 1
644 a
644 d/b
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
2010-11-29 22:13:11 +03:00
644 d2/a
tests: unify test-convert-svn-*
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
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
2010-11-29 22:13:11 +03:00
644 d2/a
tests: unify test-convert-svn-*
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
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
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
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
644 dlink/b
644 @ dlink2
644 @ dlink3
Try updating
$ hg up -qC default
$ cd ..
test-convert-svn-move.t: remove stray '
2014-09-10 19:01:47 +04:00
Test convert progress bar
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
$ cat >> $HGRCPATH <<EOF
> [progress]
convert: use new-style progress bars Reviewed By: quark-zju Differential Revision: D7329501 fbshipit-source-id: 5312f905b513200904c79acbdb1c7b17968a8aba
2018-03-21 23:41:26 +03:00
> debug = true
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
> EOF
tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
2012-10-10 03:37:54 +04:00
$ hg convert svn-repo hg-progress
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
initializing destination hg-progress repository
scanning source...
ui: deprecate ui.progress Summary: Remove ui.progress as a method of updating progress. All progress bars now go through new-style progress bars. This also splits out the rendering of progress bars from the reporting of progress. All tests are updated to use new-style debug progress bars, which simply report the position of the progress bar. Rendering of progress bars will be tested separately once the progress bar engine has been rewritten. Reviewed By: quark-zju Differential Revision: D7329488 fbshipit-source-id: 14f8ab67365ddd98b74986aa25d9abc7a0546144
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)
tests: unify test-convert-svn-*
2010-09-21 20:40:33 +04:00
sorting...
converting...
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
2010-11-29 22:13:11 +03:00
6 initial
ui: deprecate ui.progress Summary: Remove ui.progress as a method of updating progress. All progress bars now go through new-style progress bars. This also splits out the rendering of progress bars from the reporting of progress. All tests are updated to use new-style debug progress bars, which simply report the position of the progress bar. Rendering of progress bars will be tested separately once the progress bar engine has been rewritten. Reviewed By: quark-zju Differential Revision: D7329488 fbshipit-source-id: 14f8ab67365ddd98b74986aa25d9abc7a0546144
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)
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
2010-11-29 22:13:11 +03:00
5 clobber symlink
ui: deprecate ui.progress Summary: Remove ui.progress as a method of updating progress. All progress bars now go through new-style progress bars. This also splits out the rendering of progress bars from the reporting of progress. All tests are updated to use new-style debug progress bars, which simply report the position of the progress bar. Rendering of progress bars will be tested separately once the progress bar engine has been rewritten. Reviewed By: quark-zju Differential Revision: D7329488 fbshipit-source-id: 14f8ab67365ddd98b74986aa25d9abc7a0546144
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)
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
2010-11-29 22:13:11 +03:00
4 clobber1
ui: deprecate ui.progress Summary: Remove ui.progress as a method of updating progress. All progress bars now go through new-style progress bars. This also splits out the rendering of progress bars from the reporting of progress. All tests are updated to use new-style debug progress bars, which simply report the position of the progress bar. Rendering of progress bars will be tested separately once the progress bar engine has been rewritten. Reviewed By: quark-zju Differential Revision: D7329488 fbshipit-source-id: 14f8ab67365ddd98b74986aa25d9abc7a0546144
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)
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
2010-11-29 22:13:11 +03:00
3 clobber2
ui: deprecate ui.progress Summary: Remove ui.progress as a method of updating progress. All progress bars now go through new-style progress bars. This also splits out the rendering of progress bars from the reporting of progress. All tests are updated to use new-style debug progress bars, which simply report the position of the progress bar. Rendering of progress bars will be tested separately once the progress bar engine has been rewritten. Reviewed By: quark-zju Differential Revision: D7329488 fbshipit-source-id: 14f8ab67365ddd98b74986aa25d9abc7a0546144
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)
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
2010-11-29 22:13:11 +03:00
2 adddb
ui: deprecate ui.progress Summary: Remove ui.progress as a method of updating progress. All progress bars now go through new-style progress bars. This also splits out the rendering of progress bars from the reporting of progress. All tests are updated to use new-style debug progress bars, which simply report the position of the progress bar. Rendering of progress bars will be tested separately once the progress bar engine has been rewritten. Reviewed By: quark-zju Differential Revision: D7329488 fbshipit-source-id: 14f8ab67365ddd98b74986aa25d9abc7a0546144
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)
convert: make toposort order stable when multiple orderings are possible The output of some tests are changed. Not necessarily to the better, just other valid permutations.
2012-12-14 02:15:51 +04:00
1 clobberdir
ui: deprecate ui.progress Summary: Remove ui.progress as a method of updating progress. All progress bars now go through new-style progress bars. This also splits out the rendering of progress bars from the reporting of progress. All tests are updated to use new-style debug progress bars, which simply report the position of the progress bar. Rendering of progress bars will be tested separately once the progress bar engine has been rewritten. Reviewed By: quark-zju Differential Revision: D7329488 fbshipit-source-id: 14f8ab67365ddd98b74986aa25d9abc7a0546144
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)
convert: make toposort order stable when multiple orderings are possible The output of some tests are changed. Not necessarily to the better, just other valid permutations.
2012-12-14 02:15:51 +04:00
0 branch
ui: deprecate ui.progress Summary: Remove ui.progress as a method of updating progress. All progress bars now go through new-style progress bars. This also splits out the rendering of progress bars from the reporting of progress. All tests are updated to use new-style debug progress bars, which simply report the position of the progress bar. Rendering of progress bars will be tested separately once the progress bar engine has been rewritten. Reviewed By: quark-zju Differential Revision: D7329488 fbshipit-source-id: 14f8ab67365ddd98b74986aa25d9abc7a0546144
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)
tests: add missing trailing 'cd ..' Many tests didn't change back from subdirectories at the end of the tests ... and they don't have to. The missing 'cd ..' could always be added when another test case is added to the test file. This change do that tests (99.5%) consistently end up in $TESTDIR where they started, thus making it simpler to extend them or move them around.
2012-06-11 03:40:51 +04:00
$ cd ..
Reference in New Issue Copy Permalink