mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
0c36fd8b5e
Summary: Those tests were converted using: echo *.t | xargs -P20 -n1 python -m testutil.dott.translate --black --verify They run 5x faster (via run-tests.py), and 10x faster (via python directly). run-tests.py on old .t files, 652 CPU seconds: % time ./run-tests.py `cat list-t.txt` --noprogress ................................................................................................................................. # Ran 129 tests, 0 skipped, 0 failed. ./run-tests.py `cat list-t.txt` --noprogress 505.30s user 146.37s system 1451% cpu 44.899 total run-tests.py on new py tests, 135 CPU seconds: % time ./run-tests.py `cat list-py.txt` --noprogress ............................................................................................................................. # Ran 125 tests, 0 skipped, 0 failed. ./run-tests.py `cat list-py.txt` --noprogress 55.73s user 78.80s system 744% cpu 18.061 total vanilla python on new tests, 59 CPU seconds: % time (for i in `cat list-py.txt`; do python $i; done;) ( for i in `cat list-py.txt`; do; python $i; done; ) 41.61s user 17.47s system 90% cpu 1:05.31 total The new tests also have auto fix ability. `python test-foo-t.py --fix` will autofix the code. Reviewed By: xavierd Differential Revision: D16172902 fbshipit-source-id: dda53990a7dfff5ac214c1237e4206a4d67e8e48
161 lines
3.4 KiB
Python
161 lines
3.4 KiB
Python
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
# Copyright (c) Mercurial Contributors.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from testutil.dott import feature, sh, testtmp # noqa: F401
|
|
|
|
|
|
sh % "setconfig 'extensions.treemanifest=!'"
|
|
# TODO: Make this test compatibile with obsstore enabled.
|
|
sh % "setconfig 'experimental.evolution='"
|
|
sh % "cat" << r"""
|
|
[extensions]
|
|
rebase=
|
|
|
|
[phases]
|
|
publish=False
|
|
""" >> "$HGRCPATH"
|
|
|
|
|
|
sh % "hg init a"
|
|
sh % "cd a"
|
|
|
|
sh % "echo A" > "A"
|
|
sh % "hg add A"
|
|
sh % "hg ci -m A"
|
|
|
|
sh % "echo B" > "B"
|
|
sh % "hg add B"
|
|
sh % "hg ci -m B"
|
|
|
|
sh % "echo C" >> "A"
|
|
sh % "hg ci -m C"
|
|
|
|
sh % "hg up -q -C 0"
|
|
|
|
sh % "echo D" >> "A"
|
|
sh % "hg ci -m D"
|
|
|
|
sh % "echo E" > "E"
|
|
sh % "hg add E"
|
|
sh % "hg ci -m E"
|
|
|
|
sh % "hg up -q -C 0"
|
|
|
|
sh % "echo F" >> "A"
|
|
sh % "hg ci -m F"
|
|
|
|
sh % "cd .."
|
|
|
|
|
|
# Rebasing B onto E - check keep: and phases
|
|
|
|
sh % "hg clone -q -u . a a1"
|
|
sh % "cd a1"
|
|
sh % "hg phase --force --secret 2"
|
|
|
|
sh % "tglogp" == r"""
|
|
@ 5: 3225f3ea730a draft 'F'
|
|
|
|
|
| o 4: ae36e8e3dfd7 draft 'E'
|
|
| |
|
|
| o 3: 46b37eabc604 draft 'D'
|
|
|/
|
|
| o 2: 965c486023db secret 'C'
|
|
| |
|
|
| o 1: 27547f69f254 draft 'B'
|
|
|/
|
|
o 0: 4a2df7238c3b draft 'A'"""
|
|
sh % "hg rebase -s 1 -d 4 --keep" == r"""
|
|
rebasing 1:27547f69f254 "B"
|
|
rebasing 2:965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]"""
|
|
|
|
# Solve the conflict and go on:
|
|
|
|
sh % "echo 'conflict solved'" > "A"
|
|
sh % "rm A.orig"
|
|
sh % "hg resolve -m A" == r"""
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue"""
|
|
sh % "hg rebase --continue" == r'''
|
|
already rebased 1:27547f69f254 "B" as 45396c49d53b
|
|
rebasing 2:965c486023db "C"'''
|
|
|
|
sh % "tglogp" == r"""
|
|
o 7: d2d25e26288e secret 'C'
|
|
|
|
|
o 6: 45396c49d53b draft 'B'
|
|
|
|
|
| @ 5: 3225f3ea730a draft 'F'
|
|
| |
|
|
o | 4: ae36e8e3dfd7 draft 'E'
|
|
| |
|
|
o | 3: 46b37eabc604 draft 'D'
|
|
|/
|
|
| o 2: 965c486023db secret 'C'
|
|
| |
|
|
| o 1: 27547f69f254 draft 'B'
|
|
|/
|
|
o 0: 4a2df7238c3b draft 'A'"""
|
|
sh % "cd .."
|
|
|
|
|
|
# Rebase F onto E:
|
|
|
|
sh % "hg clone -q -u . a a2"
|
|
sh % "cd a2"
|
|
sh % "hg phase --force --secret 2"
|
|
|
|
sh % "tglogp" == r"""
|
|
@ 5: 3225f3ea730a draft 'F'
|
|
|
|
|
| o 4: ae36e8e3dfd7 draft 'E'
|
|
| |
|
|
| o 3: 46b37eabc604 draft 'D'
|
|
|/
|
|
| o 2: 965c486023db secret 'C'
|
|
| |
|
|
| o 1: 27547f69f254 draft 'B'
|
|
|/
|
|
o 0: 4a2df7238c3b draft 'A'"""
|
|
sh % "hg rebase -s 5 -d 4" == r"""
|
|
rebasing 5:3225f3ea730a "F" (tip)
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]"""
|
|
|
|
# Solve the conflict and go on:
|
|
|
|
sh % "echo 'conflict solved'" > "A"
|
|
sh % "rm A.orig"
|
|
sh % "hg resolve -m A" == r"""
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue"""
|
|
sh % "hg rebase --continue" == r"""
|
|
rebasing 5:3225f3ea730a "F" (tip)
|
|
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/3225f3ea730a-289ce185-rebase.hg"""
|
|
|
|
sh % "tglogp" == r"""
|
|
@ 5: 530bc6058bd0 draft 'F'
|
|
|
|
|
o 4: ae36e8e3dfd7 draft 'E'
|
|
|
|
|
o 3: 46b37eabc604 draft 'D'
|
|
|
|
|
| o 2: 965c486023db secret 'C'
|
|
| |
|
|
| o 1: 27547f69f254 draft 'B'
|
|
|/
|
|
o 0: 4a2df7238c3b draft 'A'"""
|
|
|
|
sh % "cd .."
|