mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +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
64 lines
1.9 KiB
Python
64 lines
1.9 KiB
Python
# 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 treemanifest.flatcompat=0"
|
|
|
|
sh % "enable amend rebase"
|
|
sh % "setconfig 'rebase.singletransaction=True'"
|
|
sh % "setconfig 'experimental.copytrace=off'"
|
|
sh % "setconfig 'rebase.experimental.inmemory=1'"
|
|
sh % "setconfig 'rebase.experimental.inmemory.nomergedriver=False'"
|
|
sh % "setconfig 'rebase.experimental.inmemorywarning=rebasing in-memory!'"
|
|
|
|
sh.cd(testtmp.TESTTMP)
|
|
|
|
# Create a commit with a move + content change:
|
|
sh % "newrepo"
|
|
sh % "echo 'original content'" > "file"
|
|
sh % "hg add -q"
|
|
sh % "hg commit -q -m base"
|
|
sh % "echo 'new content'" > "file"
|
|
sh % "hg mv file file_new"
|
|
sh % "hg commit -m a"
|
|
sh % "hg book -r . a"
|
|
|
|
# Recreate the same commit:
|
|
sh % "hg up -q '.~1'"
|
|
sh % "echo 'new content'" > "file"
|
|
sh % "hg mv file file_new"
|
|
sh % "hg commit -m b"
|
|
sh % "hg book -r . b"
|
|
|
|
reponame = "../without-imm"
|
|
sh.cp("-R", ".", reponame)
|
|
|
|
# Rebase one version onto the other, confirm it gets rebased out:
|
|
sh % "hg rebase -r b -d a" == r"""
|
|
rebasing in-memory!
|
|
rebasing 811ec875201f "b" (b)
|
|
note: rebase of 811ec875201f created no changes to commit"""
|
|
|
|
# Without IMM, this behavior is semi-broken: the commit is not rebased out and the
|
|
# created commit is empty. (D8676355)
|
|
sh.cd(reponame)
|
|
sh % "setconfig 'rebase.experimental.inmemory=0'"
|
|
sh % "hg rebase -r b -d a" == r"""
|
|
rebasing 811ec875201f "b" (b)
|
|
warning: can't find ancestor for 'file_new' copied from 'file'!"""
|
|
|
|
sh % "hg export tip" == r"""
|
|
# HG changeset patch
|
|
# User test
|
|
# Date 0 0
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
|
# Node ID 0fe513c05d7fe2819c3ceccb072e74940604af36
|
|
# Parent 24483d5afe6cb1a13b3642b4d8622e91f4d1bec1
|
|
b"""
|