mirror of
https://github.com/facebook/sapling.git
synced 2025-01-07 14:10:42 +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
127 lines
3.1 KiB
Perl
127 lines
3.1 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
====================================
|
|
Testing head checking code: Case D-4
|
|
====================================
|
|
|
|
Mercurial checks for the introduction of new heads on push. Evolution comes
|
|
into play to detect if existing branches on the server are being replaced by
|
|
some of the new one we push.
|
|
|
|
This case is part of a series of tests checking this behavior.
|
|
|
|
Category D: remote head is "obs-affected" locally, but result is not part of the push
|
|
TestCase 4: multi-changeset branch, split on multiple other, (base on its own new branch)
|
|
|
|
.. old-state:
|
|
..
|
|
.. * 2 branch (1 changeset, and 2 changesets)
|
|
..
|
|
.. new-state:
|
|
..
|
|
.. * 1 new branch superceeding the base of the old-2-changesets-branch,
|
|
.. * 1 new changesets on the old-1-changeset-branch superceeding the head of the other
|
|
..
|
|
.. expected-result:
|
|
..
|
|
.. * push the new branch only -> push denied (variant a)
|
|
.. * push the existing branch only -> push allowed (variant b)
|
|
.. (pushing all is tested as case A-7)
|
|
..
|
|
.. graph-summary:
|
|
..
|
|
.. (variant a)
|
|
..
|
|
.. B'○⇢ø B
|
|
.. | |
|
|
.. A | ø⇠◔ A'
|
|
.. | |/
|
|
.. C ● |
|
|
.. \|
|
|
.. ●
|
|
..
|
|
.. or (variant b)
|
|
..
|
|
.. B'◔⇢ø B
|
|
.. | |
|
|
.. A | ø⇠○ A'
|
|
.. | |/
|
|
.. C ● |
|
|
.. \|
|
|
.. ●
|
|
|
|
$ . $TESTDIR/testlib/push-checkheads-util.sh
|
|
|
|
Test setup
|
|
----------
|
|
|
|
$ mkdir D4
|
|
$ cd D4
|
|
$ setuprepos
|
|
creating basic server and client repo
|
|
updating to branch default
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd server
|
|
$ mkcommit B0
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
$ mkcommit C0
|
|
$ cd ../client
|
|
$ hg pull
|
|
pulling from $TESTTMP/D4/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 2 changes to 2 files (+1 heads)
|
|
new changesets d73caddc5533:0f88766e02d6
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ mkcommit A1
|
|
$ hg up 'desc(C0)'
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ mkcommit B1
|
|
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
|
|
obsoleted 1 changesets
|
|
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
|
|
obsoleted 1 changesets
|
|
$ hg log -G --hidden
|
|
@ d70a1f75a020 (draft): B1
|
|
|
|
|
| o f6082bc4ffef (draft): A1
|
|
| |
|
|
o | 0f88766e02d6 (draft): C0
|
|
|/
|
|
| x d73caddc5533 (draft): B0
|
|
| |
|
|
| x 8aaa48160adc (draft): A0
|
|
|/
|
|
o 1e4be0697311 (public): root
|
|
|
|
|
|
Actual testing (new branch only)
|
|
--------------------------------
|
|
|
|
$ hg push --rev 'desc(A1)'
|
|
pushing to $TESTTMP/D4/server
|
|
searching for changes
|
|
abort: push creates new remote head f6082bc4ffef!
|
|
(merge or see 'hg help push' for details about pushing new heads)
|
|
[255]
|
|
|
|
Actual testing (existing branch only)
|
|
------------------------------------
|
|
|
|
$ hg push --rev 'desc(B1)'
|
|
pushing to $TESTTMP/D4/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
1 new obsolescence markers
|
|
obsoleted 1 changesets
|
|
|
|
$ cd ../..
|