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
90 lines
2.4 KiB
Perl
90 lines
2.4 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 beta
|
|
Switched to a new branch 'beta'
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
|
|
|
|
$ cd ..
|
|
|
|
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
|
|
|
|
Make sure this is still draft since we didn't pull remote's HEAD
|
|
$ hg -R hgrepo-b phase -r beta
|
|
3bb02b6794ddc0b498cdc15f59f2e6724cabfa2f: draft
|
|
|
|
clone with mapsavefreq set
|
|
$ rm -rf hgrepo-b
|
|
$ hg clone -r beta gitrepo hgrepo-b --config hggit.mapsavefrequency=1 --debug | egrep "(saving|committing)"
|
|
committing files:
|
|
committing manifest
|
|
committing changelog
|
|
committing transaction
|
|
saving mapfile
|
|
committing files:
|
|
committing manifest
|
|
committing changelog
|
|
committing transaction
|
|
saving mapfile
|
|
|
|
Make sure that a deleted .hgsubstate does not confuse hg-git
|
|
|
|
$ cd gitrepo
|
|
$ echo 'HASH random' > .hgsubstate
|
|
$ git add .hgsubstate
|
|
$ fn_git_commit -m 'add bogus .hgsubstate'
|
|
$ git rm -q .hgsubstate
|
|
$ fn_git_commit -m 'remove bogus .hgsubstate'
|
|
$ cd ..
|
|
|
|
$ hg clone -r beta gitrepo hgrepo-c
|
|
importing git objects into hg
|
|
updating to branch default
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg --cwd hgrepo-c status
|
|
|
|
clone empty repo
|
|
$ git init empty
|
|
Initialized empty Git repository in $TESTTMP/empty/.git/
|
|
$ hg clone empty emptyhg
|
|
updating to branch default
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Ensure hggit.disallowinitbare blocks initting .hg/git
|
|
$ hg init nogitbare
|
|
$ cd nogitbare
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [hggit]
|
|
> disallowinitbare=True
|
|
> EOF
|
|
$ hg pull ../empty
|
|
pulling from ../empty
|
|
abort: missing .hg/git repo
|
|
[255]
|