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
255 lines
6.9 KiB
Perl
255 lines
6.9 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 checkout -b not-master
|
|
Switched to a new branch 'not-master'
|
|
|
|
$ cd ..
|
|
$ hg clone gitrepo hgrepo | grep -v '^updating'
|
|
importing git objects into hg
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd hgrepo
|
|
$ hg book master
|
|
$ echo beta > beta
|
|
$ hg add beta
|
|
$ fn_hg_commit -u "test" -m 'add beta'
|
|
$ hg push
|
|
pushing to $TESTTMP/gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 1 commits with 1 trees and 1 blobs
|
|
updating reference refs/heads/master
|
|
|
|
$ echo gamma >> beta
|
|
$ fn_hg_commit -u "test <test@example.com> (comment)" -m 'modify beta'
|
|
$ hg push
|
|
pushing to $TESTTMP/gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 1 commits with 1 trees and 1 blobs
|
|
updating reference refs/heads/master
|
|
|
|
$ echo gamma > gamma
|
|
$ hg add gamma
|
|
$ fn_hg_commit -u "<test@example.com>" -m 'add gamma'
|
|
$ hg push
|
|
pushing to $TESTTMP/gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 1 commits with 1 trees and 1 blobs
|
|
updating reference refs/heads/master
|
|
|
|
$ echo delta > delta
|
|
$ hg add delta
|
|
$ fn_hg_commit -u "name<test@example.com>" -m 'add delta'
|
|
$ hg push
|
|
pushing to $TESTTMP/gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 1 commits with 1 trees and 1 blobs
|
|
updating reference refs/heads/master
|
|
|
|
$ echo epsilon > epsilon
|
|
$ hg add epsilon
|
|
$ fn_hg_commit -u "name <test@example.com" -m 'add epsilon'
|
|
$ hg push
|
|
pushing to $TESTTMP/gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 1 commits with 1 trees and 1 blobs
|
|
updating reference refs/heads/master
|
|
|
|
$ echo zeta > zeta
|
|
$ hg add zeta
|
|
$ fn_hg_commit -u " test " -m 'add zeta'
|
|
$ hg push
|
|
pushing to $TESTTMP/gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 1 commits with 1 trees and 1 blobs
|
|
updating reference refs/heads/master
|
|
|
|
$ echo eta > eta
|
|
$ hg add eta
|
|
$ fn_hg_commit -u "test < test@example.com >" -m 'add eta'
|
|
$ hg push
|
|
pushing to $TESTTMP/gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 1 commits with 1 trees and 1 blobs
|
|
updating reference refs/heads/master
|
|
|
|
$ echo theta > theta
|
|
$ hg add theta
|
|
$ fn_hg_commit -u "test >test@example.com>" -m 'add theta'
|
|
$ hg push
|
|
pushing to $TESTTMP/gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 1 commits with 1 trees and 1 blobs
|
|
updating reference refs/heads/master
|
|
|
|
$ hg log --graph
|
|
@ changeset: 8:de0c236bcd02
|
|
| bookmark: master
|
|
| user: test >test@example.com>
|
|
| date: Mon Jan 01 00:00:18 2007 +0000
|
|
| summary: add theta
|
|
|
|
|
o changeset: 7:b4ada284aa0b
|
|
| user: test < test@example.com >
|
|
| date: Mon Jan 01 00:00:17 2007 +0000
|
|
| summary: add eta
|
|
|
|
|
o changeset: 6:be9e5ffbcff0
|
|
| user: test
|
|
| date: Mon Jan 01 00:00:16 2007 +0000
|
|
| summary: add zeta
|
|
|
|
|
o changeset: 5:721ffc4d7c76
|
|
| user: name <test@example.com
|
|
| date: Mon Jan 01 00:00:15 2007 +0000
|
|
| summary: add epsilon
|
|
|
|
|
o changeset: 4:f1254cd4f0d9
|
|
| user: name<test@example.com>
|
|
| date: Mon Jan 01 00:00:14 2007 +0000
|
|
| summary: add delta
|
|
|
|
|
o changeset: 3:10310359956b
|
|
| user: <test@example.com>
|
|
| date: Mon Jan 01 00:00:13 2007 +0000
|
|
| summary: add gamma
|
|
|
|
|
o changeset: 2:a6260b330211
|
|
| user: test <test@example.com> (comment)
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
| summary: modify beta
|
|
|
|
|
o changeset: 1:574e2d660a7d
|
|
| user: test
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
o changeset: 0:69982ec78c6d
|
|
bookmark: not-master
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
|
|
$ cd ..
|
|
$ hg clone gitrepo hgrepo2 | grep -v '^updating'
|
|
importing git objects into hg
|
|
8 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgrepo2 log --graph
|
|
@ changeset: 8:0e82f70d8365
|
|
| bookmark: master
|
|
| user: test ?test@example.com <test ?test@example.com>
|
|
| date: Mon Jan 01 00:00:18 2007 +0000
|
|
| summary: add theta
|
|
|
|
|
o changeset: 7:353db02be541
|
|
| user: test <test@example.com>
|
|
| date: Mon Jan 01 00:00:17 2007 +0000
|
|
| summary: add eta
|
|
|
|
|
o changeset: 6:8b7698cb629f
|
|
| user: test
|
|
| date: Mon Jan 01 00:00:16 2007 +0000
|
|
| summary: add zeta
|
|
|
|
|
o changeset: 5:8264dd8cdfb8
|
|
| user: name <test@example.com>
|
|
| date: Mon Jan 01 00:00:15 2007 +0000
|
|
| summary: add epsilon
|
|
|
|
|
o changeset: 4:ba47c351307f
|
|
| user: name <test@example.com>
|
|
| date: Mon Jan 01 00:00:14 2007 +0000
|
|
| summary: add delta
|
|
|
|
|
o changeset: 3:44bb6eac290f
|
|
| user: <test@example.com>
|
|
| date: Mon Jan 01 00:00:13 2007 +0000
|
|
| summary: add gamma
|
|
|
|
|
o changeset: 2:9699c3457ee8
|
|
| user: test <test@example.com> (comment)
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
| summary: modify beta
|
|
|
|
|
o changeset: 1:4272913025dd
|
|
| user: test
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
o changeset: 0:69982ec78c6d
|
|
bookmark: not-master
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
$ git --git-dir=gitrepo/.git log --pretty=medium master
|
|
commit 2fe60ba69727981e6ede78be70354c3a9e30e21d
|
|
Author: test ?test@example.com <test ?test@example.com>
|
|
Date: Mon Jan 1 00:00:18 2007 +0000
|
|
|
|
add theta
|
|
|
|
commit 9f2f7cafdbf2e467928db98de8275141001d3081
|
|
Author: test <test@example.com>
|
|
Date: Mon Jan 1 00:00:17 2007 +0000
|
|
|
|
add eta
|
|
|
|
commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807
|
|
Author: test <none@none>
|
|
Date: Mon Jan 1 00:00:16 2007 +0000
|
|
|
|
add zeta
|
|
|
|
commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2
|
|
Author: name <test@example.com>
|
|
Date: Mon Jan 1 00:00:15 2007 +0000
|
|
|
|
add epsilon
|
|
|
|
commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8
|
|
Author: name <test@example.com>
|
|
Date: Mon Jan 1 00:00:14 2007 +0000
|
|
|
|
add delta
|
|
|
|
commit e4149a32e81e380193f59aa8773349201b8ed7f7
|
|
Author: <test@example.com>
|
|
Date: Mon Jan 1 00:00:13 2007 +0000
|
|
|
|
add gamma
|
|
|
|
commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93
|
|
Author: test ext:(%20%28comment%29) <test@example.com>
|
|
Date: Mon Jan 1 00:00:12 2007 +0000
|
|
|
|
modify beta
|
|
|
|
commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001
|
|
Author: test <none@none>
|
|
Date: Mon Jan 1 00:00:11 2007 +0000
|
|
|
|
add beta
|
|
|
|
commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:10 2007 +0000
|
|
|
|
add alpha
|