mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
92f6f35e7a
Summary: This diff marks **ALL** mercurial tests requiring Python 2 feature. After you fixes some tests, simply remove the `py2` feature requirement and that tests will be continuously run after your diff is landed. To bypass this feature requirement, run the tests command with `HGTEST_FORCE_PY2=1`. For example: ``` HGTEST_FORCE_PY2=1 buck test //eden/scm/tests:hg_run_tests ``` or ``` HGTEST_FORCE_PY2=1 python run-tests.py ``` ---- Basically this diff are created with the following commands: ``` $ sed -i 's/import feature\(.*\)$/import feature\1\n\nfeature.require(["py2"])/' test-*-t.py $ sed -i '1s/^/#require py2\n/' test-*.t $ ls | grep -P "^test.*(?<\!-t)\.py$" > list && vim -p $(cat list) # manually adding feature requires for these Python tests. ``` (Note: this ignores all push blocking failures!) ignore-conflict-markers Reviewed By: singhsrb Differential Revision: D19655148 fbshipit-source-id: 985e3ccb4010cc559049f1d89f8909bc2d9b5e20
90 lines
2.3 KiB
Perl
90 lines
2.3 KiB
Perl
#require py2
|
|
#chg-compatible
|
|
|
|
Testing templating for rebase command
|
|
|
|
Setup
|
|
|
|
$ configure mutation-norecord
|
|
$ enable rebase
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ for ch in a b c d; do echo foo > $ch; hg commit -Aqm "Added "$ch; done
|
|
|
|
$ hg log -G -T "{rev}:{node|short} {desc}"
|
|
@ 3:62615734edd5 Added d
|
|
|
|
|
o 2:28ad74487de9 Added c
|
|
|
|
|
o 1:29becc82797a Added b
|
|
|
|
|
o 0:18d04c59bb5d Added a
|
|
|
|
Getting the JSON output for nodechanges
|
|
|
|
$ hg rebase -s 2 -d 0 -q -Tjson
|
|
json (no-eol)
|
|
|
|
$ hg log -G -T "{rev}:{node|short} {desc}"
|
|
@ 5:df21b32134ba Added d
|
|
|
|
|
o 4:849767420fd5 Added c
|
|
|
|
|
| o 1:29becc82797a Added b
|
|
|/
|
|
o 0:18d04c59bb5d Added a
|
|
|
|
$ hg rebase -s 1 -d 5 -q -T "{nodechanges|json}"
|
|
{"29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["d9d6773efc831c274eace04bc13e8e6412517139"]} (no-eol)
|
|
|
|
$ hg log -G -T "{rev}:{node|short} {desc}"
|
|
o 6:d9d6773efc83 Added b
|
|
|
|
|
@ 5:df21b32134ba Added d
|
|
|
|
|
o 4:849767420fd5 Added c
|
|
|
|
|
o 0:18d04c59bb5d Added a
|
|
|
|
|
|
$ hg rebase -s 6 -d 4 -q -T "{nodechanges % '{oldnode}:{newnodes % ' {newnode}'}'}"
|
|
d9d6773efc831c274eace04bc13e8e6412517139: f48cd65c6dc3d2acb55da54402a5b029546e546f (no-eol)
|
|
|
|
$ hg rebase -s 4 -d 4 -q -T "{nodechanges}"
|
|
abort: source and destination form a cycle
|
|
[255]
|
|
|
|
A more complex case, multiple replacements with a prune:
|
|
|
|
$ testtemplate() {
|
|
> newrepo
|
|
> drawdag <<'EOS'
|
|
> B C D # D/B = B
|
|
> \|/
|
|
> A
|
|
> EOS
|
|
> hg rebase -q -r $B+$C -d $D -T "$1" 2>/dev/null
|
|
> }
|
|
|
|
$ testtemplate 'nodechanges default style:\n{nodechanges}'
|
|
nodechanges default style:
|
|
112478962961 -> (none)
|
|
dc0947a82db8 -> 32d20c29f74a
|
|
|
|
$ testtemplate '{nodechanges % "{nodechange}"}'
|
|
112478962961 -> (none)
|
|
dc0947a82db8 -> 32d20c29f74a
|
|
|
|
$ testtemplate '{nodechanges % "OLD {oldnode} NEW {newnodes|nonempty}\n"}'
|
|
OLD 112478962961147124edd43549aedd1a335e44bf NEW (none)
|
|
OLD dc0947a82db884575bb76ea10ac97b08536bfa03 NEW 32d20c29f74a9f207416d66fbcaf72abddf1d21a
|
|
|
|
$ testtemplate '{nodechanges % "{index} -{oldnode|short} {newnodes % '"'"'+{newnode|short}'"'"'}\n"}'
|
|
0 -112478962961
|
|
1 -dc0947a82db8 +32d20c29f74a
|
|
|
|
$ testtemplate '{nodechanges|json}'
|
|
{"112478962961147124edd43549aedd1a335e44bf": [], "dc0947a82db884575bb76ea10ac97b08536bfa03": ["32d20c29f74a9f207416d66fbcaf72abddf1d21a"]} (no-eol)
|
|
|