mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +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
57 lines
1.4 KiB
Perl
57 lines
1.4 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
|
|
(merge correctly when all the files in a directory are moved
|
|
but then local changes are added in the same directory)
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
$ mkdir -p testdir
|
|
$ echo a > testdir/a
|
|
$ hg add testdir/a
|
|
$ hg commit -m a
|
|
$ cd ..
|
|
|
|
$ hg clone a b
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd a
|
|
$ echo alpha > testdir/a
|
|
$ hg commit -m remote-change
|
|
$ cd ..
|
|
|
|
$ cd b
|
|
$ mkdir testdir/subdir
|
|
$ hg mv testdir/a testdir/subdir/a
|
|
$ hg commit -m move
|
|
$ mkdir newdir
|
|
$ echo beta > newdir/beta
|
|
$ hg add newdir/beta
|
|
$ hg commit -m local-addition
|
|
$ hg pull ../a
|
|
pulling from ../a
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets cc7000b01af9
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
$ hg up -C 2
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg merge
|
|
merging testdir/subdir/a and testdir/a to testdir/subdir/a
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg stat
|
|
M testdir/subdir/a
|
|
$ hg diff --nodates
|
|
diff -r bc21c9773bfa testdir/subdir/a
|
|
--- a/testdir/subdir/a
|
|
+++ b/testdir/subdir/a
|
|
@@ -1,1 +1,1 @@
|
|
-a
|
|
+alpha
|
|
|
|
$ cd ..
|