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
82 lines
2.3 KiB
Python
82 lines
2.3 KiB
Python
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from testutil.dott import feature, sh, testtmp # noqa: F401
|
|
|
|
|
|
feature.require(["py2"])
|
|
|
|
|
|
sh % "cat" << r"""
|
|
[extensions]
|
|
tweakdefaults=
|
|
rebase=
|
|
[experimental]
|
|
updatecheck=noconflict
|
|
""" >> "$HGRCPATH"
|
|
sh % "setconfig 'ui.suggesthgprev=True'"
|
|
|
|
# Set up the repository.
|
|
sh % "hg init repo"
|
|
sh % "cd repo"
|
|
sh % "hg debugbuilddag -m '+4 *3 +1'"
|
|
sh % "hg log --graph -r '0::' -T '{rev}'" == r"""
|
|
o 5
|
|
|
|
|
o 4
|
|
|
|
|
| o 3
|
|
| |
|
|
| o 2
|
|
|/
|
|
o 1
|
|
|
|
|
o 0"""
|
|
|
|
sh % "hg up 3" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
|
|
# Make an uncommitted change.
|
|
sh % "echo foo" > "foo"
|
|
sh % "hg add foo"
|
|
sh % "hg st" == "A foo"
|
|
|
|
# Can always update to current commit.
|
|
sh % "hg up ." == "0 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
|
|
# Abort with --check set, succeed with --merge
|
|
sh % "hg up 2 --check" == r"""
|
|
abort: uncommitted changes
|
|
[255]"""
|
|
sh % "hg up --merge 2" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
|
|
# Updates to other branches should fail without --merge.
|
|
sh % "hg up 4 --check" == r"""
|
|
abort: uncommitted changes
|
|
[255]"""
|
|
sh % "hg up --merge 4" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
|
|
# Certain flags shouldn't work together.
|
|
sh % "hg up --check --merge 3" == r"""
|
|
abort: can only specify one of -C/--clean, -c/--check, or -m/--merge
|
|
[255]"""
|
|
sh % "hg up --check --clean 3" == r"""
|
|
abort: can only specify one of -C/--clean, -c/--check, or -m/--merge
|
|
[255]"""
|
|
sh % "hg up --clean --merge 3" == r"""
|
|
abort: can only specify one of -C/--clean, -c/--check, or -m/--merge
|
|
[255]"""
|
|
|
|
# --clean should work as expected.
|
|
sh % "hg st" == "A foo"
|
|
sh % "hg up --clean 3" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
sh % "hg st" == "? foo"
|
|
sh % "enable amend"
|
|
sh % "hg update '.^'" == r"""
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
hint[update-prev]: use 'hg prev' to move to the parent changeset
|
|
hint[hint-ack]: use 'hg hint --ack update-prev' to silence these hints"""
|