mirror of
https://github.com/facebook/sapling.git
synced 2025-01-07 14:10:42 +03:00
effa0da8de
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
125 lines
3.3 KiB
Perl
125 lines
3.3 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
#require svn svn-bindings
|
|
|
|
$ filter_svn_output () {
|
|
> egrep -v 'Committing|Updating|(^$)' | sed -e 's/done$//' || true
|
|
> }
|
|
|
|
$ cat <<EOF >> $HGRCPATH
|
|
> [extensions]
|
|
> convert =
|
|
> mq =
|
|
> EOF
|
|
|
|
$ SVNREPOPATH=`pwd`/svn-repo
|
|
#if windows
|
|
$ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
|
|
#else
|
|
$ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
|
|
#endif
|
|
|
|
$ svnadmin create "$SVNREPOPATH"
|
|
$ cat > "$SVNREPOPATH"/hooks/pre-revprop-change <<EOF
|
|
> #!/bin/sh
|
|
>
|
|
> REPOS="$1"
|
|
> REV="$2"
|
|
> USER="$3"
|
|
> PROPNAME="$4"
|
|
> ACTION="$5"
|
|
>
|
|
> if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi
|
|
> if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-branch" ]; then exit 0; fi
|
|
> if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-rev" ]; then exit 0; fi
|
|
>
|
|
> echo "Changing prohibited revision property" >&2
|
|
> exit 1
|
|
> EOF
|
|
$ chmod +x "$SVNREPOPATH"/hooks/pre-revprop-change
|
|
$ svn co "$SVNREPOURL" "$SVNREPOPATH"-wc
|
|
Checked out revision 0.
|
|
$ cd "$SVNREPOPATH"-wc
|
|
$ echo a > a
|
|
$ svn add a
|
|
A a
|
|
$ svn ci -m'added a' a | filter_svn_output
|
|
Adding a
|
|
Transmitting file data .
|
|
Committed revision 1.
|
|
$ cd ..
|
|
|
|
initial roundtrip
|
|
|
|
$ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg | grep -v initializing
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
0 added a
|
|
$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
|
|
second roundtrip should do nothing
|
|
|
|
$ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
|
|
new hg rev
|
|
|
|
$ hg clone "$SVNREPOPATH"-hg "$SVNREPOPATH"-work
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd "$SVNREPOPATH"-work
|
|
$ echo b > b
|
|
$ hg add b
|
|
$ hg ci -mb
|
|
|
|
adding an empty revision
|
|
|
|
$ hg qnew -m emtpy empty
|
|
$ hg qfinish -a
|
|
$ cd ..
|
|
|
|
echo hg to svn
|
|
|
|
$ hg --cwd "$SVNREPOPATH"-hg pull -q "$SVNREPOPATH"-work
|
|
$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
1 b
|
|
0 emtpy
|
|
|
|
svn back to hg should do nothing
|
|
|
|
$ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
|
|
hg back to svn should do nothing
|
|
|
|
$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
|
|
verify which shamap format we are storing and must be able to handle
|
|
|
|
$ cat svn-repo-hg/.hg/shamap
|
|
svn:????????-????-????-????-????????????@1 ???????????????????????????????????????? (glob)
|
|
svn:????????-????-????-????-????????????@2 ???????????????????????????????????????? (glob)
|
|
svn:????????-????-????-????-????????????@2 ???????????????????????????????????????? (glob)
|
|
$ cat svn-repo-wc/.svn/hg-shamap
|
|
???????????????????????????????????????? 1 (glob)
|
|
???????????????????????????????????????? svn:????????-????-????-????-????????????@2 (glob)
|
|
???????????????????????????????????????? svn:????????-????-????-????-????????????@2 (glob)
|