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
68 lines
1.6 KiB
Perl
68 lines
1.6 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
$ cat > echo.py <<EOF
|
|
> #!$PYTHON
|
|
> from __future__ import absolute_import, print_function
|
|
> import os
|
|
> import sys
|
|
> try:
|
|
> import msvcrt
|
|
> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
|
|
> msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
|
|
> except ImportError:
|
|
> pass
|
|
>
|
|
> for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):
|
|
> print(k, os.environ[k])
|
|
> EOF
|
|
|
|
Create 2 heads containing the same file, once as
|
|
a file, once as a link. Bundle was generated with:
|
|
|
|
# hg init t
|
|
# cd t
|
|
# echo a > a
|
|
# hg ci -qAm t0 -d '0 0'
|
|
# echo l > l
|
|
# hg ci -qAm t1 -d '1 0'
|
|
# hg up -C 0
|
|
# ln -s a l
|
|
# hg ci -qAm t2 -d '2 0'
|
|
# echo l2 > l2
|
|
# hg ci -qAm t3 -d '3 0'
|
|
|
|
$ hg init t
|
|
$ cd t
|
|
$ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg"
|
|
$ hg up -C 3
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Merge them and display *_ISLINK vars
|
|
merge heads
|
|
|
|
$ hg merge --tool="$PYTHON ../echo.py"
|
|
merging l
|
|
HG_FILE l
|
|
HG_MY_ISLINK 1
|
|
HG_OTHER_ISLINK 0
|
|
HG_BASE_ISLINK 0
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
Test working directory symlink bit calculation wrt copies,
|
|
especially on non-supporting systems.
|
|
merge working directory
|
|
|
|
$ hg up -C 2
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg copy l l2
|
|
$ HGMERGE="$PYTHON ../echo.py" hg up 3
|
|
merging l2
|
|
HG_FILE l2
|
|
HG_MY_ISLINK 1
|
|
HG_OTHER_ISLINK 0
|
|
HG_BASE_ISLINK 0
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd ..
|