mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +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
142 lines
2.8 KiB
Perl
142 lines
2.8 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
Make sure that the internal merge tools (internal:fail, internal:local,
|
|
internal:union and internal:other) are used when matched by a
|
|
merge-pattern in hgrc
|
|
|
|
Make sure HGMERGE doesn't interfere with the test:
|
|
|
|
$ unset HGMERGE
|
|
|
|
$ hg init
|
|
|
|
Initial file contents:
|
|
|
|
$ echo "line 1" > f
|
|
$ echo "line 2" >> f
|
|
$ echo "line 3" >> f
|
|
$ hg ci -Am "revision 0"
|
|
adding f
|
|
|
|
$ cat f
|
|
line 1
|
|
line 2
|
|
line 3
|
|
|
|
Branch 1: editing line 1:
|
|
|
|
$ sed 's/line 1/first line/' f > f.new
|
|
$ mv f.new f
|
|
$ hg ci -Am "edited first line"
|
|
|
|
Branch 2: editing line 3:
|
|
|
|
$ hg update 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ sed 's/line 3/third line/' f > f.new
|
|
$ mv f.new f
|
|
$ hg ci -Am "edited third line"
|
|
|
|
Merge using internal:fail tool:
|
|
|
|
$ echo "[merge-patterns]" > .hg/hgrc
|
|
$ echo "* = internal:fail" >> .hg/hgrc
|
|
|
|
$ hg merge
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
$ cat f
|
|
line 1
|
|
line 2
|
|
third line
|
|
|
|
$ hg stat
|
|
M f
|
|
|
|
Merge using internal:local tool:
|
|
|
|
$ hg update -C 2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new
|
|
$ mv .hg/hgrc.new .hg/hgrc
|
|
|
|
$ hg merge
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cat f
|
|
line 1
|
|
line 2
|
|
third line
|
|
|
|
$ hg stat
|
|
M f
|
|
|
|
Merge using internal:other tool:
|
|
|
|
$ hg update -C 2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new
|
|
$ mv .hg/hgrc.new .hg/hgrc
|
|
|
|
$ hg merge
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cat f
|
|
first line
|
|
line 2
|
|
line 3
|
|
|
|
$ hg stat
|
|
M f
|
|
|
|
Merge using default tool:
|
|
|
|
$ hg update -C 2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm .hg/hgrc
|
|
|
|
$ hg merge
|
|
merging f
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cat f
|
|
first line
|
|
line 2
|
|
third line
|
|
|
|
$ hg stat
|
|
M f
|
|
|
|
Merge using internal:union tool:
|
|
|
|
$ hg update -C 2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo "line 4a" >>f
|
|
$ hg ci -Am "Adding fourth line (commit 4)"
|
|
$ hg update 2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo "line 4b" >>f
|
|
$ hg ci -Am "Adding fourth line v2 (commit 5)"
|
|
|
|
$ echo "[merge-patterns]" > .hg/hgrc
|
|
$ echo "* = internal:union" >> .hg/hgrc
|
|
|
|
$ hg merge 3
|
|
merging f
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cat f
|
|
line 1
|
|
line 2
|
|
third line
|
|
line 4b
|
|
line 4a
|