mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
e9e0539cc1
Summary: We want to remove filepeer as part of removing server logic in the client. To start with, let's disable it by default and only enable it in tests that need it. The next step will be to update those tests. Reviewed By: quark-zju Differential Revision: D30977765 fbshipit-source-id: c56016f017e894a15bf43fb7a8d3a0a417663ad9
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
|
|
|
|
|
|
sh % "setconfig experimental.allowfilepeer=True"
|
|
sh.enable("remotenames")
|
|
# Set up without remotenames
|
|
(
|
|
sh % "cat"
|
|
<< r"""
|
|
[extensions]
|
|
rebase=
|
|
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 % "echo b" > "../repo/b"
|
|
sh % "hg -R ../repo commit -qAm b"
|
|
sh % "hg pull --rebase -d master" == 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}'" == r"""
|
|
@ 1 b
|
|
│
|
|
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 -d master" == 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"'''
|
|
sh % "hg log -G -T '{rev} {desc}'" == r"""
|
|
@ 4 x
|
|
│
|
|
o 3 c
|
|
│
|
|
o 1 b
|
|
│
|
|
o 0 a"""
|