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
80 lines
2.1 KiB
Perl
80 lines
2.1 KiB
Perl
#require py2
|
|
#chg-compatible
|
|
|
|
$ . "$TESTDIR/library.sh"
|
|
|
|
Set up the server
|
|
|
|
$ hginit master
|
|
$ cd master
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> remotenames=
|
|
> treemanifest=
|
|
> [treemanifest]
|
|
> server=true
|
|
> treeonly=true
|
|
> [remotefilelog]
|
|
> server=true
|
|
> shallowtrees=true
|
|
> EOF
|
|
|
|
$ echo 1 > x
|
|
$ hg commit -Aqm x1
|
|
|
|
Create client
|
|
$ cd ..
|
|
$ hgcloneshallow ssh://user@dummy/master client -q --config extensions.treemanifest= --config treemanifest.treeonly=true
|
|
fetching tree '' 2e4a95dcb6b42bbf0034f84d293bd9c71b19de64
|
|
1 trees fetched over * (glob)
|
|
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) (?)
|
|
$ cd client
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> amend=
|
|
> pushrebase=
|
|
> remotenames=
|
|
> treemanifest=
|
|
> [treemanifest]
|
|
> treeonly=true
|
|
> sendtrees=true
|
|
> EOF
|
|
|
|
Create a commit, and then amend the message twice. All three should share a manifest.
|
|
$ echo 2 > x
|
|
$ hg commit -Aqm x2
|
|
$ hg amend -m x2a
|
|
$ hg amend -m x2b
|
|
$ hg log -G -r 'all()' --hidden -T '{node} {manifest} {desc}'
|
|
@ 426667c0eafcfb0836d7a5a55f66b2b8f20c9842 4921ba8b088dda769331d6cf5c70f349b7c5c6c8 x2b
|
|
|
|
|
| x e0ce6fd597a73d4b7d1fda2cbe6337636f94d3dd 4921ba8b088dda769331d6cf5c70f349b7c5c6c8 x2a
|
|
|/
|
|
| x 5ee5c65bfee26d54c1fb59cf411fd5a81a328b83 4921ba8b088dda769331d6cf5c70f349b7c5c6c8 x2
|
|
|/
|
|
o 203f57bcaf7c8ad8dd3bb2ba85343f072905c086 2e4a95dcb6b42bbf0034f84d293bd9c71b19de64 x1
|
|
|
|
|
|
Repack - this discards the linknode for the original commit
|
|
$ hg repack
|
|
|
|
Push commit 1 to the server
|
|
$ hg unhide 1
|
|
$ hg push -r 1 --allow-anon
|
|
pushing to ssh://user@dummy/master
|
|
searching for changes
|
|
remote: adding changesets
|
|
remote: adding manifests
|
|
remote: adding file changes
|
|
remote: added 1 changesets with 1 changes to 1 files
|
|
|
|
Works ok with pushrebase.
|
|
$ hg unhide 2
|
|
$ hg push -r 2 --to test --create
|
|
pushing rev e0ce6fd597a7 to destination ssh://user@dummy/master bookmark test
|
|
searching for changes
|
|
remote: pushing 1 changeset:
|
|
remote: e0ce6fd597a7 x2a
|
|
exporting bookmark test
|