mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +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
128 lines
2.3 KiB
Python
128 lines
2.3 KiB
Python
# coding=utf-8
|
|
|
|
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
# Copyright (c) Mercurial Contributors.
|
|
#
|
|
# 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
|
|
|
|
|
|
# TODO: Make this test compatibile with obsstore enabled.
|
|
sh % "setconfig 'experimental.evolution='"
|
|
(
|
|
sh % "cat"
|
|
<< r"""
|
|
[extensions]
|
|
rebase=
|
|
|
|
[phases]
|
|
publish=False
|
|
"""
|
|
>> "$HGRCPATH"
|
|
)
|
|
|
|
|
|
sh % "hg init a"
|
|
sh % "cd a"
|
|
|
|
sh % "echo c1" > "c1"
|
|
sh % "hg ci -Am c1" == "adding c1"
|
|
|
|
sh % "echo c2" > "c2"
|
|
sh % "hg ci -Am c2" == "adding c2"
|
|
|
|
sh % "echo l1" > "l1"
|
|
sh % "hg ci -Am l1" == "adding l1"
|
|
|
|
sh % "hg up -q -C 1"
|
|
|
|
sh % "echo r1" > "r1"
|
|
sh % "hg ci -Am r1" == "adding r1"
|
|
|
|
sh % "echo r2" > "r2"
|
|
sh % "hg ci -Am r2" == "adding r2"
|
|
|
|
sh % "tglog" == r"""
|
|
@ 225af64d03e6 'r2'
|
|
│
|
|
o 8d0a8c99b309 'r1'
|
|
│
|
|
│ o 87c180a611f2 'l1'
|
|
├─╯
|
|
o 56daeba07f4b 'c2'
|
|
│
|
|
o e8faad3d03ff 'c1'"""
|
|
# Rebase with no arguments - single revision in source branch:
|
|
|
|
sh % "hg up -q -C 2"
|
|
|
|
sh % "hg rebase" == 'rebasing 87c180a611f2 "l1"'
|
|
|
|
sh % "tglog" == r"""
|
|
@ b1152cc99655 'l1'
|
|
│
|
|
o 225af64d03e6 'r2'
|
|
│
|
|
o 8d0a8c99b309 'r1'
|
|
│
|
|
o 56daeba07f4b 'c2'
|
|
│
|
|
o e8faad3d03ff 'c1'"""
|
|
sh % "cd .."
|
|
|
|
|
|
sh % "hg init b"
|
|
sh % "cd b"
|
|
|
|
sh % "echo c1" > "c1"
|
|
sh % "hg ci -Am c1" == "adding c1"
|
|
|
|
sh % "echo c2" > "c2"
|
|
sh % "hg ci -Am c2" == "adding c2"
|
|
|
|
sh % "echo l1" > "l1"
|
|
sh % "hg ci -Am l1" == "adding l1"
|
|
|
|
sh % "echo l2" > "l2"
|
|
sh % "hg ci -Am l2" == "adding l2"
|
|
|
|
sh % "hg up -q -C 1"
|
|
|
|
sh % "echo r1" > "r1"
|
|
sh % "hg ci -Am r1" == "adding r1"
|
|
|
|
sh % "tglog" == r"""
|
|
@ 8d0a8c99b309 'r1'
|
|
│
|
|
│ o 1ac923b736ef 'l2'
|
|
│ │
|
|
│ o 87c180a611f2 'l1'
|
|
├─╯
|
|
o 56daeba07f4b 'c2'
|
|
│
|
|
o e8faad3d03ff 'c1'"""
|
|
# Rebase with no arguments - single revision in target branch:
|
|
|
|
sh % "hg up -q -C 3"
|
|
|
|
sh % "hg rebase" == r'''
|
|
rebasing 87c180a611f2 "l1"
|
|
rebasing 1ac923b736ef "l2"'''
|
|
|
|
sh % "tglog" == r"""
|
|
@ 023181307ed0 'l2'
|
|
│
|
|
o 913ab52b43b4 'l1'
|
|
│
|
|
o 8d0a8c99b309 'r1'
|
|
│
|
|
o 56daeba07f4b 'c2'
|
|
│
|
|
o e8faad3d03ff 'c1'"""
|
|
|
|
sh % "cd .."
|