mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 06:47:41 +03:00
2a99866d7b
Summary: The "Portions" license cannot be updated automatically. So this is a manual update using: sd -s 'Portions Copyright (c) Facebook, Inc. and its affiliates.' 'Portions Copyright (c) Meta Platforms, Inc. and affiliates.' `rg -l Facebook` sd -s 'Copyright (c) Facebook, Inc. and its affiliates.' 'Copyright (c) Meta Platforms, Inc. and affiliates.' `rg -l Facebook` Differential Revision: D33420114 fbshipit-source-id: 49ae00a7b62e3b8cc6c5dd839b3c104a75e72a56
98 lines
2.3 KiB
Python
98 lines
2.3 KiB
Python
# coding=utf-8
|
|
|
|
# coding=utf-8
|
|
|
|
# Copyright (c) Meta Platforms, Inc. and 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='"
|
|
# Test rebase --continue with rebasestate written by legacy client
|
|
|
|
(
|
|
sh % "cat"
|
|
<< r"""
|
|
[extensions]
|
|
rebase=
|
|
"""
|
|
>> "$HGRCPATH"
|
|
)
|
|
|
|
sh % "hg init repo"
|
|
sh % "cd repo"
|
|
(
|
|
sh % "hg debugdrawdag"
|
|
<< r"""
|
|
D H
|
|
| |
|
|
C G
|
|
| |
|
|
B F
|
|
| |
|
|
Z A E
|
|
\|/
|
|
R
|
|
"""
|
|
)
|
|
|
|
# rebasestate generated by a legacy client running "hg rebase -r B+D+E+G+H -d Z"
|
|
|
|
sh % "touch .hg/last-message.txt"
|
|
sh % "cat" << r"""
|
|
0000000000000000000000000000000000000000
|
|
f424eb6a8c01c4a0c0fba9f863f79b3eb5b4b69f
|
|
0000000000000000000000000000000000000000
|
|
0
|
|
0
|
|
0
|
|
|
|
21a6c45028857f500f56ae84fbf40689c429305b:-2
|
|
de008c61a447fcfd93f808ef527d933a84048ce7:0000000000000000000000000000000000000000
|
|
c1e6b162678d07d0b204e5c8267d51b4e03b633c:0000000000000000000000000000000000000000
|
|
aeba276fcb7df8e10153a07ee728d5540693f5aa:-3
|
|
bd5548558fcf354d37613005737a143871bf3723:-3
|
|
d2fa1c02b2401b0e32867f26cce50818a4bd796a:0000000000000000000000000000000000000000
|
|
6f7a236de6852570cd54649ab62b1012bb78abc8:0000000000000000000000000000000000000000
|
|
6582e6951a9c48c236f746f186378e36f59f4928:0000000000000000000000000000000000000000
|
|
""" > ".hg/rebasestate"
|
|
|
|
sh % "hg rebase --continue" == r"""
|
|
rebasing de008c61a447 "E" (E)
|
|
rebasing c1e6b162678d "B" (B)
|
|
rebasing 6f7a236de685 "D" (D)
|
|
rebasing d2fa1c02b240 "G" (G)
|
|
rebasing 6582e6951a9c "H" (H)"""
|
|
|
|
sh % "hg log -G -T '{rev}:{node|short} {desc}\\n'" == r"""
|
|
o 14:721b8da0a708 H
|
|
│
|
|
o 13:9d65695ec3c2 G
|
|
│
|
|
│ o 12:fc52970345e8 D
|
|
│ │
|
|
│ o 11:eac96551b107 B
|
|
│ │
|
|
o │ 10:21c8397a5d68 E
|
|
├─╯
|
|
│ o 6:bd5548558fcf C
|
|
│ │
|
|
│ │ o 5:aeba276fcb7d F
|
|
│ │ │
|
|
│ x │ 4:c1e6b162678d B
|
|
│ │ │
|
|
o │ │ 3:f424eb6a8c01 Z
|
|
│ │ │
|
|
│ │ x 2:de008c61a447 E
|
|
├───╯
|
|
│ o 1:21a6c4502885 A
|
|
├─╯
|
|
o 0:b41ce7760717 R"""
|