mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +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
96 lines
1.9 KiB
Perl
96 lines
1.9 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
$ hg init
|
|
|
|
$ echo "added file1" > file1
|
|
$ echo "another line of text" >> file1
|
|
$ echo "added file2" > file2
|
|
$ hg add file1 file2
|
|
$ hg commit -m "added file1 and file2"
|
|
|
|
$ echo "changed file1" >> file1
|
|
$ hg commit -m "changed file1"
|
|
|
|
$ hg -q log
|
|
1:dfab7f3c2efb
|
|
0:c3fa057dd86f
|
|
$ hg id
|
|
dfab7f3c2efb tip
|
|
|
|
$ hg update -C 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg id
|
|
c3fa057dd86f
|
|
|
|
$ echo "changed file1" >> file1
|
|
$ hg id
|
|
c3fa057dd86f+
|
|
|
|
$ hg revert --no-backup --all
|
|
reverting file1
|
|
$ hg diff
|
|
$ hg status
|
|
$ hg id
|
|
c3fa057dd86f
|
|
|
|
$ hg update
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg diff
|
|
$ hg status
|
|
$ hg id
|
|
dfab7f3c2efb tip
|
|
|
|
$ hg update -C 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo "changed file1 different" >> file1
|
|
|
|
$ hg update
|
|
merging file1
|
|
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges
|
|
[1]
|
|
|
|
$ hg diff --nodates
|
|
diff -r dfab7f3c2efb file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,3 +1,7 @@
|
|
added file1
|
|
another line of text
|
|
+<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2
|
|
+changed file1 different
|
|
+=======
|
|
changed file1
|
|
+>>>>>>> destination: dfab7f3c2efb - test: changed file1
|
|
|
|
$ hg status
|
|
M file1
|
|
? file1.orig
|
|
$ hg id
|
|
dfab7f3c2efb+ tip
|
|
|
|
$ hg revert --no-backup --all
|
|
reverting file1
|
|
$ hg diff
|
|
$ hg status
|
|
? file1.orig
|
|
$ hg id
|
|
dfab7f3c2efb tip
|
|
|
|
$ hg revert -r tip --no-backup --all
|
|
$ hg diff
|
|
$ hg status
|
|
? file1.orig
|
|
$ hg id
|
|
dfab7f3c2efb tip
|
|
|
|
$ hg update -C
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg diff
|
|
$ hg status
|
|
? file1.orig
|
|
$ hg id
|
|
dfab7f3c2efb tip
|
|
|