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
136 lines
4.0 KiB
Perl
136 lines
4.0 KiB
Perl
#require py2
|
|
$ disable treemanifest
|
|
Load commonly used test logic
|
|
$ . "$TESTDIR/hggit/testutil"
|
|
|
|
$ hg init hgrepo
|
|
$ cd hgrepo
|
|
$ echo alpha > alpha
|
|
$ hg add alpha
|
|
$ fn_hg_commit -m "add alpha"
|
|
$ hg log --graph --debug | grep -v phase:
|
|
@ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
manifest: 8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
|
|
user: test
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
files+: alpha
|
|
extra: branch=default
|
|
description:
|
|
add alpha
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
configure for use from git
|
|
$ hg clone hgrepo gitrepo
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd gitrepo
|
|
$ hg book master
|
|
$ hg up null | egrep -v '^\(leaving bookmark master\)$'
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo "[git]" >> .hg/hgrc
|
|
$ echo "intree = True" >> .hg/hgrc
|
|
$ hg gexport
|
|
|
|
do some work
|
|
$ git config core.bare false
|
|
$ git checkout master
|
|
Already on 'master'
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
|
|
get things back to hg
|
|
$ hg gimport
|
|
importing git objects into hg
|
|
$ hg log --graph --debug | grep -v phase:
|
|
o changeset: 1:d294862c083a2eac3c1b31d3a3bdbdffb49a5b25
|
|
| bookmark: master
|
|
| parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2
|
|
| parent: -1:0000000000000000000000000000000000000000
|
|
| manifest: f0bd6fbafbaebe4bb59c35108428f6fce152431d
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| files+: beta
|
|
| extra: branch=default
|
|
| extra: convert_revision=fef06279bff0022eee567d65729d8e795fd3efe8
|
|
| extra: hg-git-rename-source=git
|
|
| description:
|
|
| add beta
|
|
|
|
|
|
|
|
o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
manifest: 8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
|
|
user: test
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
files+: alpha
|
|
extra: branch=default
|
|
description:
|
|
add alpha
|
|
|
|
|
|
gimport should have updated the bookmarks as well
|
|
$ hg bookmarks
|
|
master 1:d294862c083a
|
|
|
|
gimport support for git.mindate
|
|
$ cat >> .hg/hgrc << EOF
|
|
> [git]
|
|
> mindate = 2014-01-02 00:00:00 +0000
|
|
> EOF
|
|
$ echo oldcommit > oldcommit
|
|
$ git add oldcommit
|
|
$ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \
|
|
> GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \
|
|
> git commit -m oldcommit > /dev/null || echo "git commit error"
|
|
$ hg gimport
|
|
no changes found
|
|
$ hg log --graph
|
|
o changeset: 1:d294862c083a
|
|
| bookmark: master
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
o changeset: 0:0221c246a567
|
|
user: test
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
|
|
$ echo newcommit > newcommit
|
|
$ git add newcommit
|
|
$ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \
|
|
> GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \
|
|
> git commit -m newcommit > /dev/null || echo "git commit error"
|
|
$ hg gimport
|
|
importing git objects into hg
|
|
$ hg log --graph
|
|
o changeset: 3:3231f2356e13
|
|
| bookmark: master
|
|
| user: test <test@example.org>
|
|
| date: Wed Jan 01 00:00:00 2014 +0000
|
|
| summary: newcommit
|
|
|
|
|
o changeset: 2:7912581b53bd
|
|
| user: test <test@example.org>
|
|
| date: Sat Mar 01 00:00:00 2014 +0000
|
|
| summary: oldcommit
|
|
|
|
|
o changeset: 1:d294862c083a
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
o changeset: 0:0221c246a567
|
|
user: test
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|