mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
05ae4dd6f8
Summary: Disabling treemanifest is a tech debt that causes problems, especially when enabling remotefilelog. Reviewed By: andll Differential Revision: D27971120 fbshipit-source-id: 1a50acc23564c2d6bad79a2e99469850b5a7d1f9
70 lines
1.7 KiB
Python
70 lines
1.7 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
|
|
|
|
|
|
# Set up with remotenames
|
|
(
|
|
sh % "cat"
|
|
<< r"""
|
|
[extensions]
|
|
rebase=
|
|
remotenames=
|
|
tweakdefaults=
|
|
"""
|
|
>> "$HGRCPATH"
|
|
)
|
|
|
|
sh % "hg init repo"
|
|
sh % "echo a" > "repo/a"
|
|
sh % "hg -R repo commit -qAm a"
|
|
sh % "hg -R repo bookmark master"
|
|
sh % "hg clone -q repo clone"
|
|
sh % "cd clone"
|
|
|
|
# Pull --rebase with no local changes
|
|
sh % "hg bookmark localbookmark -t master"
|
|
sh % "echo b" > "../repo/b"
|
|
sh % "hg -R ../repo commit -qAm b"
|
|
sh % "hg pull --rebase" == r"""
|
|
pulling from $TESTTMP/repo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
nothing to rebase - fast-forwarded to master"""
|
|
sh % "hg log -G -T '{rev} {desc}: {bookmarks}'" == r"""
|
|
@ 1 b: localbookmark
|
|
│
|
|
o 0 a:"""
|
|
# Make a local commit and check pull --rebase still works.
|
|
sh % "echo x" > "x"
|
|
sh % "hg commit -qAm x"
|
|
sh % "echo c" > "../repo/c"
|
|
sh % "hg -R ../repo commit -qAm c"
|
|
sh % "hg pull --rebase" == r"""
|
|
pulling from $TESTTMP/repo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
rebasing 86d71924e1d0 "x" (localbookmark)"""
|
|
sh % "hg log -G -T '{rev} {desc}: {bookmarks}'" == r"""
|
|
@ 4 x: localbookmark
|
|
│
|
|
o 3 c:
|
|
│
|
|
o 1 b:
|
|
│
|
|
o 0 a:"""
|