mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 06:47:41 +03:00
9fd86a4fae
Summary: This applies the formatting changes from black v21.4b2 to all covered projects in fbsource. Most changes are to single line docstrings, as black will now remove leading and trailing whitespace to match PEP8. Any other formatting changes are likely due to files that landed without formatting, or files that previously triggered errors in black. Any changes to code should be AST identical. Any test failures are likely due to bad tests, or testing against the output of pyfmt. Reviewed By: thatch Differential Revision: D28204910 fbshipit-source-id: 804725bcd14f763e90c5ddff1d0418117c15809a
85 lines
2.3 KiB
Python
85 lines
2.3 KiB
Python
# coding=utf-8
|
|
|
|
# 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
|
|
|
|
|
|
(
|
|
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"""
|