mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +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
75 lines
1.8 KiB
Turing
75 lines
1.8 KiB
Turing
$ . helpers-usechg.sh
|
|
|
|
#require bzr
|
|
|
|
N.B. bzr 1.13 has a bug that breaks this test. If you see this
|
|
test fail, check your bzr version. Upgrading to bzr 1.13.1
|
|
should fix it.
|
|
|
|
$ . "$TESTDIR/bzr-definitions"
|
|
|
|
test multiple merges at once
|
|
|
|
$ mkdir test-multimerge
|
|
$ cd test-multimerge
|
|
$ bzr init -q source
|
|
$ cd source
|
|
$ echo content > file
|
|
$ bzr add -q file
|
|
$ bzr commit -q -m 'Initial add'
|
|
$ cd ..
|
|
$ bzr branch -q source source-branch1
|
|
$ cd source-branch1
|
|
$ echo morecontent >> file
|
|
$ echo evenmorecontent > file-branch1
|
|
$ bzr add -q file-branch1
|
|
$ bzr commit -q -m 'Added branch1 file'
|
|
$ cd ../source
|
|
$ sleep 1
|
|
$ echo content > file-parent
|
|
$ bzr add -q file-parent
|
|
$ bzr commit -q -m 'Added parent file'
|
|
$ cd ..
|
|
$ bzr branch -q source source-branch2
|
|
$ cd source-branch2
|
|
$ echo somecontent > file-branch2
|
|
$ bzr add -q file-branch2
|
|
$ bzr commit -q -m 'Added brach2 file'
|
|
$ sleep 1
|
|
$ cd ../source
|
|
$ bzr merge -q ../source-branch1
|
|
$ bzr merge -q --force ../source-branch2
|
|
$ bzr commit -q -m 'Merged branches'
|
|
$ cd ..
|
|
$ hg convert --datesort source source-hg
|
|
initializing destination source-hg repository
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
4 Initial add
|
|
3 Added branch1 file
|
|
2 Added parent file
|
|
1 Added brach2 file
|
|
0 Merged branches
|
|
$ glog -R source-hg
|
|
o 5@source "(octopus merge fixup)" files:
|
|
|\
|
|
| o 4@source "Merged branches" files: file-branch2
|
|
| |\
|
|
o---+ 3@source-branch2 "Added brach2 file" files: file-branch2
|
|
/ /
|
|
| o 2@source "Added parent file" files: file-parent
|
|
| |
|
|
o | 1@source-branch1 "Added branch1 file" files: file file-branch1
|
|
|/
|
|
o 0@source "Initial add" files: file
|
|
|
|
$ manifest source-hg tip
|
|
% manifest of tip
|
|
644 file
|
|
644 file-branch1
|
|
644 file-branch2
|
|
644 file-parent
|
|
|
|
$ cd ..
|