mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
192 lines
5.3 KiB
Python
192 lines
5.3 KiB
Python
# 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
|
|
|
|
|
|
sh % "setconfig 'extensions.treemanifest=!'"
|
|
sh % "hg init t"
|
|
sh % "cd t"
|
|
sh % "echo 1" > "foo"
|
|
sh % "hg ci -Am m" == "adding foo"
|
|
|
|
sh % "cd .."
|
|
sh % "hg clone t tt" == r"""
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
|
|
sh % "cd tt"
|
|
sh % "echo 1.1" > "foo"
|
|
sh % "hg ci -Am m"
|
|
|
|
sh % "cd ../t"
|
|
sh % "echo 1.2" > "foo"
|
|
sh % "hg ci -Am m"
|
|
|
|
# Should respect config to disable dirty update
|
|
sh % "hg co -qC 0"
|
|
sh % "echo 2" > "foo"
|
|
sh % "hg --config 'commands.update.check=abort' pull -u ../tt" == r"""
|
|
pulling from ../tt
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
abort: uncommitted changes
|
|
[255]"""
|
|
sh % "hg debugstrip --no-backup tip"
|
|
sh % "hg co -qC tip"
|
|
|
|
# Should not update to the other topological branch:
|
|
|
|
sh % "hg pull -u ../tt" == r'''
|
|
pulling from ../tt
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 1 files
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
updated to "800c91d5bfc1: m"
|
|
1 other heads for branch "default"'''
|
|
|
|
sh % "cd ../tt"
|
|
|
|
# Should not update to the other branch:
|
|
|
|
sh % "hg pull -u ../t" == r'''
|
|
pulling from ../t
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
updated to "107cefe13e42: m"
|
|
1 other heads for branch "default"'''
|
|
|
|
sh % "'HGMERGE=true' hg merge" == r"""
|
|
merging foo
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)"""
|
|
sh % "hg ci -mm"
|
|
|
|
sh % "cd ../t"
|
|
|
|
# Should work:
|
|
|
|
sh % "hg pull -u ../tt" == r"""
|
|
pulling from ../tt
|
|
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"""
|
|
|
|
# Similarity between "hg update" and "hg pull -u" in handling bookmark
|
|
# ====================================================================
|
|
|
|
# Test that updating activates the bookmark, which matches with the
|
|
# explicit destination of the update.
|
|
|
|
sh % "echo 4" >> "foo"
|
|
sh % "hg commit -m '#4'"
|
|
sh % "hg bookmark active-after-pull"
|
|
sh % "cd ../tt"
|
|
|
|
# (1) activating by --rev BOOKMARK
|
|
|
|
sh % "hg bookmark -f active-before-pull"
|
|
sh % "hg bookmarks" == " * active-before-pull 483b76ad4309"
|
|
|
|
sh % "cp -R . $TESTTMP/tt-1"
|
|
sh % "cd $TESTTMP/tt-1"
|
|
|
|
sh % "hg pull -u -r active-after-pull" == r"""
|
|
pulling from $TESTTMP/t
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
adding remote bookmark active-after-pull
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark active-after-pull)"""
|
|
|
|
sh % "hg parents -q" == "f815b3da6163"
|
|
sh % "hg bookmarks" == r"""
|
|
* active-after-pull f815b3da6163
|
|
active-before-pull 483b76ad4309"""
|
|
|
|
# (discard pulled changes)
|
|
|
|
sh % "cd $TESTTMP/tt"
|
|
|
|
# (2) activating by URL#BOOKMARK
|
|
|
|
sh % "hg bookmark -f active-before-pull" == ""
|
|
sh % "hg bookmarks" == " * active-before-pull 483b76ad4309"
|
|
|
|
sh % "cp -R . $TESTTMP/tt-2"
|
|
sh % "cd $TESTTMP/tt-2"
|
|
|
|
sh % "hg pull -u '$TESTTMP/t#active-after-pull'" == r"""
|
|
pulling from $TESTTMP/t
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
adding remote bookmark active-after-pull
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark active-after-pull)"""
|
|
|
|
sh % "hg parents -q" == "f815b3da6163"
|
|
sh % "hg bookmarks" == r"""
|
|
* active-after-pull f815b3da6163
|
|
active-before-pull 483b76ad4309"""
|
|
|
|
# (discard pulled changes)
|
|
|
|
sh % "cd $TESTTMP/tt"
|
|
sh % "hg update -q 483b76ad4309"
|
|
|
|
# Test that updating deactivates current active bookmark, if the
|
|
# destination of the update is explicitly specified, and it doesn't
|
|
# match with the name of any existing bookmarks.
|
|
|
|
sh % "cd ../t"
|
|
sh % "hg bookmark -d active-after-pull"
|
|
sh % "hg commit -m '#5 (bar #1)' --config 'ui.allowemptycommit=1'"
|
|
sh % "cd ../tt"
|
|
|
|
# (1) deactivating by --rev REV
|
|
|
|
sh % "hg bookmark -f active-before-pull" == ""
|
|
sh % "hg bookmarks" == " * active-before-pull 483b76ad4309"
|
|
|
|
sh % "hg pull -u -r f815b3da6163" == r"""
|
|
pulling from $TESTTMP/t
|
|
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
|
|
(leaving bookmark active-before-pull)"""
|
|
|
|
sh % "hg parents -q" == "f815b3da6163"
|
|
sh % "hg bookmarks" == " active-before-pull 483b76ad4309"
|
|
|
|
# (discard pulled changes)
|
|
|
|
sh % "hg update -q 483b76ad4309"
|
|
|
|
sh % "cd .."
|