mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +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
91 lines
2.5 KiB
Perl
91 lines
2.5 KiB
Perl
#require py2
|
|
Load commonly used test logic
|
|
$ . "$TESTDIR/hggit/testutil"
|
|
|
|
$ git init gitrepo
|
|
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
|
|
$ cd gitrepo
|
|
$ echo alpha > alpha
|
|
$ git add alpha
|
|
$ fn_git_commit -m 'add alpha'
|
|
|
|
$ git tag alpha
|
|
|
|
$ git checkout -b beta
|
|
Switched to a new branch 'beta'
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
|
|
|
|
$ cd ..
|
|
clone a tag
|
|
$ hg clone -r alpha gitrepo hgrepo-a | grep -v '^updating'
|
|
importing git objects into hg
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgrepo-a log --graph
|
|
@ changeset: 0:69982ec78c6d
|
|
bookmark: master
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
clone a branch
|
|
$ hg clone -r beta gitrepo hgrepo-b | grep -v '^updating'
|
|
importing git objects into hg
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgrepo-b log --graph
|
|
@ changeset: 1:3bb02b6794dd
|
|
| bookmark: beta
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
o changeset: 0:69982ec78c6d
|
|
bookmark: master
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
$ cd gitrepo
|
|
$ echo beta line 2 >> beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add to beta'
|
|
|
|
$ cd ..
|
|
$ cd hgrepo-b
|
|
$ hg debugstrip tip 2>&1 | grep -v saving | grep -v backup
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg pull -r beta
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
abort: you appear to have run strip - please run hg git-cleanup
|
|
[255]
|
|
$ hg git-cleanup
|
|
git commit map cleaned
|
|
pull works after 'hg git-cleanup'
|
|
"adding remote bookmark" message was added in Mercurial 2.3
|
|
$ hg pull -r beta | grep -v "adding remote bookmark"
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
$ hg log --graph
|
|
o changeset: 2:3db9bf9073b5
|
|
| bookmark: beta
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
| summary: add to beta
|
|
|
|
|
o changeset: 1:3bb02b6794dd
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:69982ec78c6d
|
|
bookmark: master
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
|
|
$ cd ..
|