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
146 lines
3.2 KiB
Perl
146 lines
3.2 KiB
Perl
#chg-compatible
|
|
|
|
Testing diff --change
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
|
|
$ echo "first" > file.txt
|
|
$ hg add file.txt
|
|
$ hg commit -m 'first commit' # 0
|
|
|
|
$ echo "second" > file.txt
|
|
$ hg commit -m 'second commit' # 1
|
|
|
|
$ echo "third" > file.txt
|
|
$ hg commit -m 'third commit' # 2
|
|
|
|
$ hg diff --nodates --change 'desc(second)'
|
|
diff -r 4bb65dda5db4 -r e9b286083166 file.txt
|
|
--- a/file.txt
|
|
+++ b/file.txt
|
|
@@ -1,1 +1,1 @@
|
|
-first
|
|
+second
|
|
|
|
$ hg diff --change e9b286083166
|
|
diff -r 4bb65dda5db4 -r e9b286083166 file.txt
|
|
--- a/file.txt Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -1,1 +1,1 @@
|
|
-first
|
|
+second
|
|
|
|
$ cd ..
|
|
|
|
Test dumb revspecs: top-level "x:y", "x:", ":y" and ":" ranges should be handled
|
|
as pairs even if x == y, but not for "f(x:y)" nor "x::y" (issue3474, issue4774)
|
|
|
|
$ hg clone -q a dumbspec
|
|
$ cd dumbspec
|
|
$ echo "wdir" > file.txt
|
|
|
|
$ hg diff -r 'desc(third)':'desc(third)'
|
|
$ hg diff -r 'desc(third)':.
|
|
$ hg diff -r 'desc(third)':
|
|
$ hg diff -r :'desc(first)'
|
|
$ hg diff -r 'desc(third):first(desc(third):desc(third))'
|
|
$ hg diff -r 'first(desc(third):desc(third))' --nodates
|
|
diff -r bf5ff72eb7e0 file.txt
|
|
--- a/file.txt
|
|
+++ b/file.txt
|
|
@@ -1,1 +1,1 @@
|
|
-third
|
|
+wdir
|
|
$ hg diff -r '(desc(third):desc(third))' --nodates
|
|
diff -r bf5ff72eb7e0 file.txt
|
|
--- a/file.txt
|
|
+++ b/file.txt
|
|
@@ -1,1 +1,1 @@
|
|
-third
|
|
+wdir
|
|
$ hg diff -r 'desc(third)'::'desc(third)' --nodates
|
|
diff -r bf5ff72eb7e0 file.txt
|
|
--- a/file.txt
|
|
+++ b/file.txt
|
|
@@ -1,1 +1,1 @@
|
|
-third
|
|
+wdir
|
|
$ hg diff -r "desc(third) and desc(second)"
|
|
abort: empty revision range
|
|
[255]
|
|
|
|
$ cd ..
|
|
|
|
$ hg clone -qr0 a dumbspec-rev0
|
|
$ cd dumbspec-rev0
|
|
$ echo "wdir" > file.txt
|
|
|
|
$ hg diff -r :
|
|
$ hg diff -r 'first(:)' --nodates
|
|
diff -r 4bb65dda5db4 file.txt
|
|
--- a/file.txt
|
|
+++ b/file.txt
|
|
@@ -1,1 +1,1 @@
|
|
-first
|
|
+wdir
|
|
|
|
$ cd ..
|
|
|
|
Testing diff --change when merge:
|
|
|
|
$ cd a
|
|
|
|
$ for i in 1 2 3 4 5 6 7 8 9 10; do
|
|
> echo $i >> file.txt
|
|
> done
|
|
$ hg commit -m "lots of text" # 3
|
|
|
|
$ sed -e 's,^2$,x,' file.txt > file.txt.tmp
|
|
$ mv file.txt.tmp file.txt
|
|
$ hg commit -m "change 2 to x" # 4
|
|
|
|
$ hg up -r 'desc(lots)'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ sed -e 's,^8$,y,' file.txt > file.txt.tmp
|
|
$ mv file.txt.tmp file.txt
|
|
$ hg commit -m "change 8 to y"
|
|
|
|
$ hg up -C -r 273b50f17c6deb75b5a8652e5a9ca30bab9d8e40
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg merge -r 'max(desc(change))'
|
|
merging file.txt
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg commit -m "merge 8 to y" # 6
|
|
|
|
$ hg diff --change 'max(desc(change))'
|
|
diff -r ae119d680c82 -r 9085c5c02e52 file.txt
|
|
--- a/file.txt Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -6,6 +6,6 @@
|
|
5
|
|
6
|
|
7
|
|
-8
|
|
+y
|
|
9
|
|
10
|
|
|
|
must be similar to 'hg diff --change 5':
|
|
|
|
$ hg diff -c 'desc(merge)'
|
|
diff -r 273b50f17c6d -r 979ca961fd2e file.txt
|
|
--- a/file.txt Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -6,6 +6,6 @@
|
|
5
|
|
6
|
|
7
|
|
-8
|
|
+y
|
|
9
|
|
10
|
|
|
|
$ cd ..
|