mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +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
117 lines
2.2 KiB
Perl
117 lines
2.2 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
$ hg init
|
|
|
|
$ echo foo > foo
|
|
$ echo bar > bar
|
|
$ hg ci -qAm 'add foo bar'
|
|
|
|
$ echo foo2 >> foo
|
|
$ echo bleh > bar
|
|
$ hg ci -m 'change foo bar'
|
|
|
|
$ hg up -qC 0
|
|
$ hg mv foo foo1
|
|
$ echo foo1 > foo1
|
|
$ hg cat foo >> foo1
|
|
$ hg ci -m 'mv foo foo1'
|
|
|
|
$ hg merge
|
|
merging foo1 and foo to foo1
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg debugstate --nodates
|
|
m 0 -2 unset bar
|
|
m 0 -2 unset foo1
|
|
copy: foo -> foo1
|
|
|
|
$ hg st -q
|
|
M bar
|
|
M foo1
|
|
|
|
|
|
Removing foo1 and bar:
|
|
|
|
$ cp foo1 F
|
|
$ cp bar B
|
|
$ hg rm -f foo1 bar
|
|
|
|
$ hg debugstate --nodates
|
|
r 0 -1 set bar
|
|
r 0 -1 set foo1
|
|
copy: foo -> foo1
|
|
|
|
$ hg st -qC
|
|
R bar
|
|
R foo1
|
|
|
|
|
|
Re-adding foo1 and bar:
|
|
|
|
$ cp F foo1
|
|
$ cp B bar
|
|
$ hg add -v foo1 bar
|
|
adding bar
|
|
adding foo1
|
|
|
|
$ hg debugstate --nodates
|
|
n 0 -2 unset bar
|
|
n 0 -2 unset foo1
|
|
copy: foo -> foo1
|
|
|
|
$ hg st -qC
|
|
M bar
|
|
M foo1
|
|
foo
|
|
|
|
|
|
Reverting foo1 and bar:
|
|
|
|
$ hg revert -vr . foo1 bar
|
|
saving current version of bar as bar.orig
|
|
reverting bar
|
|
saving current version of foo1 as foo1.orig
|
|
reverting foo1
|
|
|
|
$ hg debugstate --nodates
|
|
n 0 -2 unset bar
|
|
n 0 -2 unset foo1
|
|
copy: foo -> foo1
|
|
|
|
$ hg st -qC
|
|
M bar
|
|
M foo1
|
|
foo
|
|
|
|
$ hg diff
|
|
|
|
Merge should not overwrite local file that is untracked after remove
|
|
|
|
$ rm *
|
|
$ hg up -qC
|
|
$ hg rm bar
|
|
$ hg ci -m 'remove bar'
|
|
$ echo 'memories of buried pirate treasure' > bar
|
|
$ hg merge
|
|
bar: untracked file differs
|
|
abort: untracked files in working directory differ from files in requested revision
|
|
[255]
|
|
$ cat bar
|
|
memories of buried pirate treasure
|
|
|
|
Those who use force will lose
|
|
|
|
$ hg merge -f
|
|
other [merge rev] changed bar which local [working copy] deleted
|
|
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
|
|
merging foo1 and foo to foo1
|
|
0 files updated, 1 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
$ cat bar
|
|
bleh
|
|
$ hg st
|
|
M bar
|
|
M foo1
|