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
63 lines
1.0 KiB
Perl
63 lines
1.0 KiB
Perl
#require py2
|
|
#chg-compatible
|
|
|
|
|
|
$ enable absorb
|
|
|
|
$ hg init repo1
|
|
$ cd repo1
|
|
|
|
Make some commits:
|
|
|
|
$ for i in 1 2 3; do
|
|
> echo $i >> a
|
|
> hg commit -A a -m "commit $i" -q
|
|
> done
|
|
|
|
absorb --edit-lines will run the editor if filename is provided:
|
|
|
|
$ hg absorb --apply-changes --edit-lines
|
|
nothing applied
|
|
[1]
|
|
$ HGEDITOR=cat hg absorb --apply-changes --edit-lines a
|
|
HG: editing a
|
|
HG: "y" means the line to the right exists in the changeset to the top
|
|
HG:
|
|
HG: /---- 4ec16f85269a commit 1
|
|
HG: |/--- 5c5f95224a50 commit 2
|
|
HG: ||/-- 43f0a75bede7 commit 3
|
|
HG: |||
|
|
yyy : 1
|
|
yy : 2
|
|
y : 3
|
|
nothing applied
|
|
[1]
|
|
|
|
Edit the file using --edit-lines:
|
|
|
|
$ cat > editortext << EOF
|
|
> y : a
|
|
> yy : b
|
|
> y : c
|
|
> yy : d
|
|
> y y : e
|
|
> y : f
|
|
> yyy : g
|
|
> EOF
|
|
$ HGEDITOR='cat editortext >' hg absorb -q --apply-changes --edit-lines a
|
|
$ hg cat -r '.^^' a
|
|
d
|
|
e
|
|
f
|
|
g
|
|
$ hg cat -r '.^' a
|
|
b
|
|
c
|
|
d
|
|
g
|
|
$ hg cat -r . a
|
|
a
|
|
b
|
|
e
|
|
g
|