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
280 lines
7.5 KiB
Perl
280 lines
7.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'
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
$ mkdir foo
|
|
$ echo blah > foo/bar
|
|
$ git add foo
|
|
$ fn_git_commit -m 'add foo'
|
|
$ git rm alpha
|
|
rm 'alpha'
|
|
$ fn_git_commit -m 'remove alpha'
|
|
$ git rm foo/bar
|
|
rm 'foo/bar'
|
|
$ fn_git_commit -m 'remove foo/bar'
|
|
$ ln -s beta betalink
|
|
$ git add betalink
|
|
$ fn_git_commit -m 'add symlink to beta'
|
|
replace symlink with file
|
|
$ rm betalink
|
|
$ echo betalink > betalink
|
|
$ git add betalink
|
|
$ fn_git_commit -m 'replace symlink with file'
|
|
replace file with symlink
|
|
$ rm betalink
|
|
$ ln -s beta betalink
|
|
$ git add betalink
|
|
$ fn_git_commit -m 'replace file with symlink'
|
|
$ git rm betalink
|
|
rm 'betalink'
|
|
$ fn_git_commit -m 'remove betalink'
|
|
final manifest in git is just beta
|
|
$ git ls-files
|
|
beta
|
|
$ git log --pretty=medium
|
|
commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:18 2007 +0000
|
|
|
|
remove betalink
|
|
|
|
commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:17 2007 +0000
|
|
|
|
replace file with symlink
|
|
|
|
commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:16 2007 +0000
|
|
|
|
replace symlink with file
|
|
|
|
commit 5492e6e410e42df527956be945286cd1ae45acb8
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:15 2007 +0000
|
|
|
|
add symlink to beta
|
|
|
|
commit b991de8952c482a7cd51162674ffff8474862218
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:14 2007 +0000
|
|
|
|
remove foo/bar
|
|
|
|
commit b0edaf0adac19392cf2867498b983bc5192b41dd
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:13 2007 +0000
|
|
|
|
remove alpha
|
|
|
|
commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:12 2007 +0000
|
|
|
|
add foo
|
|
|
|
commit 9497a4ee62e16ee641860d7677cdb2589ea15554
|
|
Author: test <test@example.org>
|
|
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
|
|
|
|
$ cd ..
|
|
$ git init --bare gitrepo2
|
|
Initialized empty Git repository in $TESTTMP/gitrepo2/
|
|
|
|
$ 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 log --graph
|
|
@ changeset: 8:378e6ad159a5
|
|
| bookmark: master
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:18 2007 +0000
|
|
| summary: remove betalink
|
|
|
|
|
o changeset: 7:cdab01d82d2c
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:17 2007 +0000
|
|
| summary: replace file with symlink
|
|
|
|
|
o changeset: 6:6489fe6b5d5d
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:16 2007 +0000
|
|
| summary: replace symlink with file
|
|
|
|
|
o changeset: 5:8b6301fee25f
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:15 2007 +0000
|
|
| summary: add symlink to beta
|
|
|
|
|
o changeset: 4:c1cc4c542dff
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:14 2007 +0000
|
|
| summary: remove foo/bar
|
|
|
|
|
o changeset: 3:ac85e2bfa8ee
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:13 2007 +0000
|
|
| summary: remove alpha
|
|
|
|
|
o changeset: 2:02c84a0b42d8
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
| summary: add foo
|
|
|
|
|
o changeset: 1:3bb02b6794dd
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
o changeset: 0:69982ec78c6d
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
|
|
make sure alpha is not in this manifest
|
|
$ hg manifest -r 3
|
|
beta
|
|
foo/bar
|
|
|
|
make sure that only beta is in the manifest
|
|
$ hg manifest
|
|
beta
|
|
|
|
$ hg gclear
|
|
clearing out the git cache data
|
|
$ hg push ../gitrepo2
|
|
pushing to ../gitrepo2
|
|
searching for changes
|
|
adding objects
|
|
added 9 commits with 8 trees and 5 blobs
|
|
|
|
$ cd ..
|
|
$ git --git-dir=gitrepo2 log --pretty=medium
|
|
commit 68c7019f1bfb2828f7f9200fac967921f06a1feb
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:18 2007 +0000
|
|
|
|
remove betalink
|
|
|
|
commit d59a3b386d681c94e5e79793b06c7333f221c443
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:17 2007 +0000
|
|
|
|
replace file with symlink
|
|
|
|
commit 9c7cc15377285c52231e122d00f0e134b352b0e6
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:16 2007 +0000
|
|
|
|
replace symlink with file
|
|
|
|
commit 03a89ec31682f257e820b4693e3f1b402f8c9d05
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:15 2007 +0000
|
|
|
|
add symlink to beta
|
|
|
|
commit e2d4ee11209b5ad206ceffb9ce31eb076b25f52e
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:14 2007 +0000
|
|
|
|
remove foo/bar
|
|
|
|
commit db5085c1477a08eb9735c425f9a605f919b6d3cd
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:13 2007 +0000
|
|
|
|
remove alpha
|
|
|
|
commit d5e6a099c8c0f2d8a407e1f1d86367b58526c2df
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:12 2007 +0000
|
|
|
|
add foo
|
|
|
|
commit dbed4f6a8ff04d4d1f0a5ce79f9a07cf0f461d7f
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:11 2007 +0000
|
|
|
|
add beta
|
|
|
|
commit 205598a42833e532ad20d80414b8e3b85a65936e
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:10 2007 +0000
|
|
|
|
add alpha
|
|
|
|
test with rename detection enabled
|
|
$ hg --config git.similarity=100 clone gitrepo hgreporenames | grep -v '^updating'
|
|
importing git objects into hg
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd hgreporenames
|
|
$ hg log --graph
|
|
@ changeset: 8:378e6ad159a5
|
|
| bookmark: master
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:18 2007 +0000
|
|
| summary: remove betalink
|
|
|
|
|
o changeset: 7:cdab01d82d2c
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:17 2007 +0000
|
|
| summary: replace file with symlink
|
|
|
|
|
o changeset: 6:6489fe6b5d5d
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:16 2007 +0000
|
|
| summary: replace symlink with file
|
|
|
|
|
o changeset: 5:8b6301fee25f
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:15 2007 +0000
|
|
| summary: add symlink to beta
|
|
|
|
|
o changeset: 4:c1cc4c542dff
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:14 2007 +0000
|
|
| summary: remove foo/bar
|
|
|
|
|
o changeset: 3:ac85e2bfa8ee
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:13 2007 +0000
|
|
| summary: remove alpha
|
|
|
|
|
o changeset: 2:02c84a0b42d8
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
| summary: add foo
|
|
|
|
|
o changeset: 1:3bb02b6794dd
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
o changeset: 0:69982ec78c6d
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|