mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +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
88 lines
2.2 KiB
Perl
88 lines
2.2 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
$ hgcommit() {
|
|
> hg commit -u user "$@"
|
|
> }
|
|
|
|
$ hg init clhead
|
|
$ cd clhead
|
|
|
|
$ touch foo && hg add && hgcommit -m 'foo'
|
|
adding foo
|
|
$ touch bar && hg add && hgcommit -m 'bar'
|
|
adding bar
|
|
$ touch baz && hg add && hgcommit -m 'baz'
|
|
adding baz
|
|
|
|
$ echo "flub" > foo
|
|
$ hgcommit -m "flub"
|
|
$ echo "nub" > foo
|
|
$ hgcommit -m "nub"
|
|
|
|
$ hg up -C 2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo "c1" > c1
|
|
$ hg add c1
|
|
$ hgcommit -m "c1"
|
|
$ echo "c2" > c1
|
|
$ hgcommit -m "c2"
|
|
|
|
$ hg up -C 2
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo "d1" > d1
|
|
$ hg add d1
|
|
$ hgcommit -m "d1"
|
|
$ echo "d2" > d1
|
|
$ hgcommit -m "d2"
|
|
$ hg tag -l good
|
|
|
|
fail with three heads
|
|
$ hg up -C good
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg merge
|
|
abort: branch 'default' has 3 heads - please merge with an explicit rev
|
|
(run 'hg heads .' to see heads)
|
|
[255]
|
|
|
|
close one of the heads
|
|
$ hg up -C 6
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hgcommit -m 'close this head' --close-branch
|
|
|
|
succeed with two open heads
|
|
$ hg up -C good
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg up -C good
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg merge
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hgcommit -m 'merged heads'
|
|
|
|
hg update -C 8
|
|
$ hg update -C 8
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
hg branch some-branch
|
|
$ hg branch some-branch
|
|
marked working directory as branch some-branch
|
|
(branches are permanent and global, did you want a bookmark?)
|
|
hg commit
|
|
$ hgcommit -m 'started some-branch'
|
|
hg commit --close-branch
|
|
$ hgcommit --close-branch -m 'closed some-branch'
|
|
|
|
hg update default
|
|
$ hg update default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
hg merge some-branch
|
|
$ hg merge some-branch
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
hg commit (no reopening of some-branch)
|
|
$ hgcommit -m 'merge with closed branch'
|
|
|
|
$ cd ..
|