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
72 lines
1.6 KiB
Python
72 lines
1.6 KiB
Python
# coding=utf-8
|
|
|
|
# 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 % "enable rebase"
|
|
sh % "newrepo"
|
|
(
|
|
sh % "drawdag"
|
|
<< r"""
|
|
D # A/A=1\n
|
|
| # B/A=(removed)
|
|
B C # B/Renamed=1\n
|
|
|/ # C/A=2\n
|
|
A
|
|
"""
|
|
)
|
|
|
|
sh % "hg up -q $C"
|
|
sh % "hg rebase -r $C -d $D '--config=ui.interactive=1' '--config=experimental.copytrace=off'" << r"""
|
|
r
|
|
Renamed
|
|
""" == r"""
|
|
rebasing 85b47c0eb942 "C"
|
|
other [source] changed A which local [dest] deleted
|
|
use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? r
|
|
path 'A' in commit 85b47c0eb942 was renamed to [what path] in commit ed4ad4ec6472 ? Renamed
|
|
merging Renamed"""
|
|
|
|
sh % "hg log -Gp -T '{desc}\\n' --git Renamed A" == r"""
|
|
@ C
|
|
╷ diff --git a/Renamed b/Renamed
|
|
╷ --- a/Renamed
|
|
╷ +++ b/Renamed
|
|
╷ @@ -1,1 +1,1 @@
|
|
╷ -1
|
|
╷ +2
|
|
╷
|
|
o B
|
|
│ diff --git a/A b/A
|
|
│ deleted file mode 100644
|
|
│ --- a/A
|
|
│ +++ /dev/null
|
|
│ @@ -1,1 +0,0 @@
|
|
│ -1
|
|
│ diff --git a/Renamed b/Renamed
|
|
│ new file mode 100644
|
|
│ --- /dev/null
|
|
│ +++ b/Renamed
|
|
│ @@ -0,0 +1,1 @@
|
|
│ +1
|
|
│
|
|
o A
|
|
diff --git a/A b/A
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/A
|
|
@@ -0,0 +1,1 @@
|
|
+1"""
|
|
|
|
# status should not show "! A"
|
|
sh % "hg status" == ""
|