mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +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.7 KiB
Python
64 lines
1.7 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 % "hg init repo"
|
|
sh % "cd repo"
|
|
|
|
sh % "echo file1version1" > "file1"
|
|
sh % "echo file2version1" > "file2"
|
|
sh % "echo file3version1" > "file3"
|
|
sh % "hg commit -Aqm base"
|
|
sh % "echo file1version2" > "file1"
|
|
sh % "hg commit -qm 'file1 change1'"
|
|
sh % "echo file2version2" > "file2"
|
|
sh % "hg commit -qm 'unrelated change to file2'"
|
|
sh % "echo file1version3" > "file1"
|
|
sh % "hg commit -qm 'file1 change2'"
|
|
sh % "echo file3verison2" > "file3"
|
|
|
|
# Normal diff shows the unrelated change in the intervening commit.
|
|
sh % "hg diff -r 1 -r 3 --nodates" == r"""
|
|
diff -r b586868a82b9 -r 362c080b3cff file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,1 +1,1 @@
|
|
-file1version2
|
|
+file1version3
|
|
diff -r b586868a82b9 -r 362c080b3cff file2
|
|
--- a/file2
|
|
+++ b/file2
|
|
@@ -1,1 +1,1 @@
|
|
-file2version1
|
|
+file2version2"""
|
|
|
|
# With --only-files-in-revs, that is excluded.
|
|
sh % "hg diff -r 1 -r 3 --nodates --only-files-in-revs" == r"""
|
|
diff -r b586868a82b9 -r 362c080b3cff file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,1 +1,1 @@
|
|
-file1version2
|
|
+file1version3"""
|
|
|
|
# Similarly, with a single rev, only consider files modified in that rev and the working copy.
|
|
sh % "hg diff -r 1 --nodates --only-files-in-revs" == r"""
|
|
diff -r b586868a82b9 file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,1 +1,1 @@
|
|
-file1version2
|
|
+file1version3
|
|
diff -r b586868a82b9 file3
|
|
--- a/file3
|
|
+++ b/file3
|
|
@@ -1,1 +1,1 @@
|
|
-file3version1
|
|
+file3verison2"""
|