mirror of
https://github.com/facebook/sapling.git
synced 2024-12-28 23:54:12 +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
67 lines
1.5 KiB
Perl
67 lines
1.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
|
|
$ mkdir d1
|
|
$ echo a > d1/f1
|
|
$ echo b > d1/f2
|
|
$ git add d1/f1 d1/f2
|
|
$ fn_git_commit -m initial
|
|
|
|
$ mkdir d2
|
|
$ git mv d1/f2 d2/f2
|
|
$ fn_git_commit -m 'rename'
|
|
|
|
$ rm -r d1
|
|
$ echo c > d1
|
|
$ git add --all d1
|
|
$ fn_git_commit -m 'replace a dir with a file'
|
|
|
|
|
|
$ cd ..
|
|
$ git init --bare gitrepo2
|
|
Initialized empty Git repository in $TESTTMP/gitrepo2/
|
|
|
|
$ hg clone gitrepo hgrepo | grep -v '^updating'
|
|
importing git objects into hg
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd hgrepo
|
|
$ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n'
|
|
adds: d1
|
|
dels: d1/f1
|
|
adds: d2/f2
|
|
dels: d1/f2
|
|
adds: d1/f1 d1/f2
|
|
dels:
|
|
|
|
$ hg gclear
|
|
clearing out the git cache data
|
|
$ hg push ../gitrepo2
|
|
pushing to ../gitrepo2
|
|
searching for changes
|
|
adding objects
|
|
added 3 commits with 6 trees and 3 blobs
|
|
$ cd ..
|
|
|
|
$ git --git-dir=gitrepo2 log --pretty=medium
|
|
commit d16fb6b69bb183a673483b4d239c3ecd1c5476ec
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:12 2007 +0000
|
|
|
|
replace a dir with a file
|
|
|
|
commit 5b24ce288cfde71c483834f3b2b62aa5bcb05a43
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:11 2007 +0000
|
|
|
|
rename
|
|
|
|
commit 9f99e4bc96145e874b20c616cd8824b6e74f9fc7
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:10 2007 +0000
|
|
|
|
initial
|