mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
66bd74e558
Test Plan: run-tests-.py Reviewers: mitrandir, #mercurial Reviewed By: mitrandir Subscribers: ps, terrelln Differential Revision: https://phabricator.intern.facebook.com/D6675896 Tasks: T24908724 Signature: 6675896:1515448382:df8d80cd7356ae8f5fb04586dc4a0a651bc498fd
610 lines
14 KiB
Perl
610 lines
14 KiB
Perl
Test that rename detection works
|
|
$ . "$TESTDIR/hggit/testutil"
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [diff]
|
|
> git = True
|
|
> [git]
|
|
> similarity = 50
|
|
> EOF
|
|
|
|
$ git init -q gitrepo
|
|
$ cd gitrepo
|
|
$ for i in 1 2 3 4 5 6 7 8 9 10; do echo $i >> alpha; done
|
|
$ git add alpha
|
|
$ fn_git_commit -malpha
|
|
|
|
Rename a file
|
|
$ git mv alpha beta
|
|
$ echo 11 >> beta
|
|
$ git add beta
|
|
$ fn_git_commit -mbeta
|
|
|
|
Copy a file
|
|
$ cp beta gamma
|
|
$ echo 12 >> beta
|
|
$ echo 13 >> gamma
|
|
$ git add beta gamma
|
|
$ fn_git_commit -mgamma
|
|
|
|
Add a submodule (gitlink) and move it to a different spot:
|
|
$ cd ..
|
|
$ git init -q gitsubmodule
|
|
$ cd gitsubmodule
|
|
$ touch subalpha
|
|
$ git add subalpha
|
|
$ fn_git_commit -msubalpha
|
|
$ cd ../gitrepo
|
|
|
|
$ git submodule add ../gitsubmodule
|
|
Cloning into '$TESTTMP/gitrepo/gitsubmodule'...
|
|
done.
|
|
$ fn_git_commit -m 'add submodule'
|
|
$ sed -e 's/path = gitsubmodule/path = gitsubmodule2/' .gitmodules > .gitmodules-new
|
|
$ mv .gitmodules-new .gitmodules
|
|
$ mv gitsubmodule gitsubmodule2
|
|
|
|
Previous versions of git did not produce any output but 2.14 changed the output
|
|
to warn the user about submodules
|
|
|
|
$ git add .gitmodules gitsubmodule2 2>/dev/null
|
|
$ git rm --cached gitsubmodule
|
|
rm 'gitsubmodule'
|
|
$ fn_git_commit -m 'move submodule'
|
|
|
|
Rename a file elsewhere and replace it with a symlink:
|
|
|
|
$ git mv beta beta-new
|
|
$ ln -s beta-new beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'beta renamed'
|
|
|
|
Rename the file back:
|
|
|
|
$ git rm beta
|
|
rm 'beta'
|
|
$ git mv beta-new beta
|
|
$ fn_git_commit -m 'beta renamed back'
|
|
|
|
Rename a file elsewhere and replace it with a submodule:
|
|
|
|
$ git mv gamma gamma-new
|
|
$ git submodule add ../gitsubmodule gamma 2>&1
|
|
Cloning into '$TESTTMP/gitrepo/gamma'...
|
|
done.
|
|
$ fn_git_commit -m 'rename and add submodule'
|
|
|
|
Remove the submodule and rename the file back:
|
|
|
|
$ grep 'submodule "gitsubmodule"' -A2 .gitmodules > .gitmodules-new
|
|
$ mv .gitmodules-new .gitmodules
|
|
$ git add .gitmodules
|
|
$ git rm --cached gamma
|
|
rm 'gamma'
|
|
$ rm -rf gamma
|
|
$ git mv gamma-new gamma
|
|
$ fn_git_commit -m 'remove submodule and rename back'
|
|
|
|
$ git checkout -f -b not-master 2>&1
|
|
Switched to a new branch 'not-master'
|
|
|
|
$ cd ..
|
|
$ hg clone -q gitrepo hgrepo
|
|
$ cd hgrepo
|
|
$ hg book master -q
|
|
$ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n"
|
|
@ 8 a26f94023ab2ea40c9e4c4dbb753c9a4e572fefe remove submodule and rename back
|
|
| branch=default hg-git-rename-source=git
|
|
|
|
|
| diff --git a/.gitmodules b/.gitmodules
|
|
| --- a/.gitmodules
|
|
| +++ b/.gitmodules
|
|
| @@ -1,6 +1,3 @@
|
|
| [submodule "gitsubmodule"]
|
|
| path = gitsubmodule2
|
|
| url = ../gitsubmodule
|
|
| -[submodule "gamma"]
|
|
| - path = gamma
|
|
| - url = ../gitsubmodule
|
|
| diff --git a/.hgsub b/.hgsub
|
|
| --- a/.hgsub
|
|
| +++ b/.hgsub
|
|
| @@ -1,2 +1,1 @@
|
|
| gitsubmodule2 = [git]../gitsubmodule
|
|
| -gamma = [git]../gitsubmodule
|
|
| diff --git a/.hgsubstate b/.hgsubstate
|
|
| --- a/.hgsubstate
|
|
| +++ b/.hgsubstate
|
|
| @@ -1,2 +1,1 @@
|
|
| -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma
|
|
| 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2
|
|
| diff --git a/gamma-new b/gamma
|
|
| rename from gamma-new
|
|
| rename to gamma
|
|
|
|
|
o 7 a7c65d466ee1f33540695666c2e65dcbe3fbe388 rename and add submodule
|
|
| branch=default hg-git-rename-source=git
|
|
|
|
|
| diff --git a/.gitmodules b/.gitmodules
|
|
| --- a/.gitmodules
|
|
| +++ b/.gitmodules
|
|
| @@ -1,3 +1,6 @@
|
|
| [submodule "gitsubmodule"]
|
|
| path = gitsubmodule2
|
|
| url = ../gitsubmodule
|
|
| +[submodule "gamma"]
|
|
| + path = gamma
|
|
| + url = ../gitsubmodule
|
|
| diff --git a/.hgsub b/.hgsub
|
|
| --- a/.hgsub
|
|
| +++ b/.hgsub
|
|
| @@ -1,1 +1,2 @@
|
|
| gitsubmodule2 = [git]../gitsubmodule
|
|
| +gamma = [git]../gitsubmodule
|
|
| diff --git a/.hgsubstate b/.hgsubstate
|
|
| --- a/.hgsubstate
|
|
| +++ b/.hgsubstate
|
|
| @@ -1,1 +1,2 @@
|
|
| +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma
|
|
| 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2
|
|
| diff --git a/gamma b/gamma-new
|
|
| rename from gamma
|
|
| rename to gamma-new
|
|
|
|
|
o 6 10614bb16f4d240ba81b6a71d76a7aa160621a29 beta renamed back
|
|
| branch=default hg-git-rename-source=git
|
|
|
|
|
| diff --git a/beta b/beta
|
|
| old mode 120000
|
|
| new mode 100644
|
|
| --- a/beta
|
|
| +++ b/beta
|
|
| @@ -1,1 +1,12 @@
|
|
| -beta-new
|
|
| \ No newline at end of file
|
|
| +1
|
|
| +2
|
|
| +3
|
|
| +4
|
|
| +5
|
|
| +6
|
|
| +7
|
|
| +8
|
|
| +9
|
|
| +10
|
|
| +11
|
|
| +12
|
|
| diff --git a/beta-new b/beta-new
|
|
| deleted file mode 100644
|
|
| --- a/beta-new
|
|
| +++ /dev/null
|
|
| @@ -1,12 +0,0 @@
|
|
| -1
|
|
| -2
|
|
| -3
|
|
| -4
|
|
| -5
|
|
| -6
|
|
| -7
|
|
| -8
|
|
| -9
|
|
| -10
|
|
| -11
|
|
| -12
|
|
|
|
|
o 5 96ad24db491a180ccd330556129d75377e201f63 beta renamed
|
|
| branch=default hg-git-rename-source=git
|
|
|
|
|
| diff --git a/beta b/beta
|
|
| old mode 100644
|
|
| new mode 120000
|
|
| --- a/beta
|
|
| +++ b/beta
|
|
| @@ -1,12 +1,1 @@
|
|
| -1
|
|
| -2
|
|
| -3
|
|
| -4
|
|
| -5
|
|
| -6
|
|
| -7
|
|
| -8
|
|
| -9
|
|
| -10
|
|
| -11
|
|
| -12
|
|
| +beta-new
|
|
| \ No newline at end of file
|
|
| diff --git a/beta b/beta-new
|
|
| copy from beta
|
|
| copy to beta-new
|
|
|
|
|
o 4 d22608e850ea875936802e119831f1789f5d98bd move submodule
|
|
| branch=default hg-git-rename-source=git
|
|
|
|
|
| diff --git a/.gitmodules b/.gitmodules
|
|
| --- a/.gitmodules
|
|
| +++ b/.gitmodules
|
|
| @@ -1,3 +1,3 @@
|
|
| [submodule "gitsubmodule"]
|
|
| - path = gitsubmodule
|
|
| + path = gitsubmodule2
|
|
| url = ../gitsubmodule
|
|
| diff --git a/.hgsub b/.hgsub
|
|
| --- a/.hgsub
|
|
| +++ b/.hgsub
|
|
| @@ -1,1 +1,1 @@
|
|
| -gitsubmodule = [git]../gitsubmodule
|
|
| +gitsubmodule2 = [git]../gitsubmodule
|
|
| diff --git a/.hgsubstate b/.hgsubstate
|
|
| --- a/.hgsubstate
|
|
| +++ b/.hgsubstate
|
|
| @@ -1,1 +1,1 @@
|
|
| -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule
|
|
| +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2
|
|
|
|
|
o 3 db55fd0e7083555ec886f6175fa0a42a711c6592 add submodule
|
|
| branch=default hg-git-rename-source=git
|
|
|
|
|
| diff --git a/.gitmodules b/.gitmodules
|
|
| new file mode 100644
|
|
| --- /dev/null
|
|
| +++ b/.gitmodules
|
|
| @@ -0,0 +1,3 @@
|
|
| +[submodule "gitsubmodule"]
|
|
| + path = gitsubmodule
|
|
| + url = ../gitsubmodule
|
|
| diff --git a/.hgsub b/.hgsub
|
|
| new file mode 100644
|
|
| --- /dev/null
|
|
| +++ b/.hgsub
|
|
| @@ -0,0 +1,1 @@
|
|
| +gitsubmodule = [git]../gitsubmodule
|
|
| diff --git a/.hgsubstate b/.hgsubstate
|
|
| new file mode 100644
|
|
| --- /dev/null
|
|
| +++ b/.hgsubstate
|
|
| @@ -0,0 +1,1 @@
|
|
| +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule
|
|
|
|
|
o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma
|
|
| branch=default hg-git-rename-source=git
|
|
|
|
|
| diff --git a/beta b/beta
|
|
| --- a/beta
|
|
| +++ b/beta
|
|
| @@ -9,3 +9,4 @@
|
|
| 9
|
|
| 10
|
|
| 11
|
|
| +12
|
|
| diff --git a/beta b/gamma
|
|
| copy from beta
|
|
| copy to gamma
|
|
| --- a/beta
|
|
| +++ b/gamma
|
|
| @@ -9,3 +9,4 @@
|
|
| 9
|
|
| 10
|
|
| 11
|
|
| +13
|
|
|
|
|
o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta
|
|
| branch=default hg-git-rename-source=git
|
|
|
|
|
| diff --git a/alpha b/beta
|
|
| rename from alpha
|
|
| rename to beta
|
|
| --- a/alpha
|
|
| +++ b/beta
|
|
| @@ -8,3 +8,4 @@
|
|
| 8
|
|
| 9
|
|
| 10
|
|
| +11
|
|
|
|
|
o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha
|
|
branch=default hg-git-rename-source=git
|
|
|
|
diff --git a/alpha b/alpha
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/alpha
|
|
@@ -0,0 +1,10 @@
|
|
+1
|
|
+2
|
|
+3
|
|
+4
|
|
+5
|
|
+6
|
|
+7
|
|
+8
|
|
+9
|
|
+10
|
|
|
|
|
|
Make a new ordinary commit in Mercurial (no extra metadata)
|
|
$ echo 14 >> gamma
|
|
$ hg ci -m "gamma2"
|
|
|
|
Make a new commit with a copy and a rename in Mercurial
|
|
$ hg cp gamma delta
|
|
$ echo 15 >> delta
|
|
$ hg mv beta epsilon
|
|
$ echo 16 >> epsilon
|
|
$ hg ci -m "delta/epsilon"
|
|
$ hg export .
|
|
# HG changeset patch
|
|
# User test
|
|
# Date 0 0
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
|
# Node ID a725f9bdefe29f1a1db89ad030d9f1ee36b3a440
|
|
# Parent 814ed6aa5bd2867ce5ab80f3c2602155d89027b1
|
|
delta/epsilon
|
|
|
|
diff --git a/gamma b/delta
|
|
copy from gamma
|
|
copy to delta
|
|
--- a/gamma
|
|
+++ b/delta
|
|
@@ -11,3 +11,4 @@
|
|
11
|
|
13
|
|
14
|
|
+15
|
|
diff --git a/beta b/epsilon
|
|
rename from beta
|
|
rename to epsilon
|
|
--- a/beta
|
|
+++ b/epsilon
|
|
@@ -10,3 +10,4 @@
|
|
10
|
|
11
|
|
12
|
|
+16
|
|
$ hg push
|
|
pushing to $TESTTMP/gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 2 commits with 2 trees and 3 blobs
|
|
updating reference refs/heads/master
|
|
|
|
$ cd ../gitrepo
|
|
$ git log master --pretty=oneline
|
|
5f2948d029693346043f320620af99a615930dc4 delta/epsilon
|
|
bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2
|
|
50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back
|
|
59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule
|
|
f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back
|
|
055f482277da6cd3dd37c7093d06983bad68f782 beta renamed
|
|
d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule
|
|
c610256cb6959852d9e70d01902a06726317affc add submodule
|
|
e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma
|
|
cc83241f39927232f690d370894960b0d1943a0e beta
|
|
938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha
|
|
|
|
Make sure the right metadata is stored
|
|
$ git cat-file commit "master^"
|
|
tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8
|
|
parent 50d116676a308b7c22935137d944e725d2296f2a
|
|
author test <none@none> 0 +0000
|
|
committer test <none@none> 0 +0000
|
|
HG:rename-source hg
|
|
|
|
gamma2
|
|
$ git cat-file commit master
|
|
tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155
|
|
parent bbd2ec050f7fbc64f772009844f7d58a556ec036
|
|
author test <none@none> 0 +0000
|
|
committer test <none@none> 0 +0000
|
|
HG:rename gamma:delta
|
|
HG:rename beta:epsilon
|
|
|
|
delta/epsilon
|
|
|
|
Now make another clone and compare the hashes
|
|
|
|
$ cd ..
|
|
$ hg clone -q gitrepo hgrepo2
|
|
$ cd hgrepo2
|
|
$ hg book master -qf
|
|
$ hg export master
|
|
# HG changeset patch
|
|
# User test
|
|
# Date 0 0
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
|
# Node ID a725f9bdefe29f1a1db89ad030d9f1ee36b3a440
|
|
# Parent 814ed6aa5bd2867ce5ab80f3c2602155d89027b1
|
|
delta/epsilon
|
|
|
|
diff --git a/gamma b/delta
|
|
copy from gamma
|
|
copy to delta
|
|
--- a/gamma
|
|
+++ b/delta
|
|
@@ -11,3 +11,4 @@
|
|
11
|
|
13
|
|
14
|
|
+15
|
|
diff --git a/beta b/epsilon
|
|
rename from beta
|
|
rename to epsilon
|
|
--- a/beta
|
|
+++ b/epsilon
|
|
@@ -10,3 +10,4 @@
|
|
10
|
|
11
|
|
12
|
|
+16
|
|
|
|
Regenerate the Git metadata and compare the hashes
|
|
$ hg gclear
|
|
clearing out the git cache data
|
|
$ hg gexport
|
|
$ cd .hg/git
|
|
$ git log master --pretty=oneline
|
|
5f2948d029693346043f320620af99a615930dc4 delta/epsilon
|
|
bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2
|
|
50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back
|
|
59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule
|
|
f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back
|
|
055f482277da6cd3dd37c7093d06983bad68f782 beta renamed
|
|
d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule
|
|
c610256cb6959852d9e70d01902a06726317affc add submodule
|
|
e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma
|
|
cc83241f39927232f690d370894960b0d1943a0e beta
|
|
938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha
|
|
|
|
Test findcopiesharder
|
|
|
|
$ cd $TESTTMP
|
|
$ git init -q gitcopyharder
|
|
$ cd gitcopyharder
|
|
$ cat >> file0 << EOF
|
|
> 1
|
|
> 2
|
|
> 3
|
|
> 4
|
|
> 5
|
|
> EOF
|
|
$ git add file0
|
|
$ fn_git_commit -m file0
|
|
$ cp file0 file1
|
|
$ git add file1
|
|
$ fn_git_commit -m file1
|
|
$ cp file0 file2
|
|
$ echo 6 >> file2
|
|
$ git add file2
|
|
$ fn_git_commit -m file2
|
|
|
|
$ cd ..
|
|
|
|
Clone without findcopiesharder does not find copies from unmodified files
|
|
|
|
$ hg clone gitcopyharder hgnocopyharder
|
|
importing git objects into hg
|
|
updating to branch default
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgnocopyharder export 1::2
|
|
# HG changeset patch
|
|
# User test <test@example.org>
|
|
# Date 1167609621 0
|
|
# Mon Jan 01 00:00:21 2007 +0000
|
|
# Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4
|
|
# Parent b45d023c6842337ffe694663a44aa672d311081c
|
|
file1
|
|
|
|
diff --git a/file1 b/file1
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/file1
|
|
@@ -0,0 +1,5 @@
|
|
+1
|
|
+2
|
|
+3
|
|
+4
|
|
+5
|
|
# HG changeset patch
|
|
# User test <test@example.org>
|
|
# Date 1167609622 0
|
|
# Mon Jan 01 00:00:22 2007 +0000
|
|
# Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc
|
|
# Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4
|
|
file2
|
|
|
|
diff --git a/file2 b/file2
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/file2
|
|
@@ -0,0 +1,6 @@
|
|
+1
|
|
+2
|
|
+3
|
|
+4
|
|
+5
|
|
+6
|
|
|
|
findcopiesharder finds copies from unmodified files if similarity is met
|
|
|
|
$ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0
|
|
importing git objects into hg
|
|
updating to branch default
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgcopyharder0 export 1::2
|
|
# HG changeset patch
|
|
# User test <test@example.org>
|
|
# Date 1167609621 0
|
|
# Mon Jan 01 00:00:21 2007 +0000
|
|
# Node ID cd05a87103eed9d270fc05b62b00f48e174ab960
|
|
# Parent b45d023c6842337ffe694663a44aa672d311081c
|
|
file1
|
|
|
|
diff --git a/file0 b/file1
|
|
copy from file0
|
|
copy to file1
|
|
# HG changeset patch
|
|
# User test <test@example.org>
|
|
# Date 1167609622 0
|
|
# Mon Jan 01 00:00:22 2007 +0000
|
|
# Node ID 9b30998342729c7357d418bebed7399986cfe643
|
|
# Parent cd05a87103eed9d270fc05b62b00f48e174ab960
|
|
file2
|
|
|
|
diff --git a/file0 b/file2
|
|
copy from file0
|
|
copy to file2
|
|
--- a/file0
|
|
+++ b/file2
|
|
@@ -3,3 +3,4 @@
|
|
3
|
|
4
|
|
5
|
|
+6
|
|
|
|
$ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1
|
|
importing git objects into hg
|
|
updating to branch default
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgcopyharder1 export 1::2
|
|
# HG changeset patch
|
|
# User test <test@example.org>
|
|
# Date 1167609621 0
|
|
# Mon Jan 01 00:00:21 2007 +0000
|
|
# Node ID cd05a87103eed9d270fc05b62b00f48e174ab960
|
|
# Parent b45d023c6842337ffe694663a44aa672d311081c
|
|
file1
|
|
|
|
diff --git a/file0 b/file1
|
|
copy from file0
|
|
copy to file1
|
|
# HG changeset patch
|
|
# User test <test@example.org>
|
|
# Date 1167609622 0
|
|
# Mon Jan 01 00:00:22 2007 +0000
|
|
# Node ID d9d2e8cbf050772be31dccf78851f71dc547d139
|
|
# Parent cd05a87103eed9d270fc05b62b00f48e174ab960
|
|
file2
|
|
|
|
diff --git a/file2 b/file2
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/file2
|
|
@@ -0,0 +1,6 @@
|
|
+1
|
|
+2
|
|
+3
|
|
+4
|
|
+5
|
|
+6
|
|
|
|
Config values out of range
|
|
$ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2
|
|
importing git objects into hg
|
|
abort: git.similarity must be between 0 and 100
|
|
[255]
|
|
$ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2
|
|
importing git objects into hg
|
|
abort: git.renamelimit must be non-negative
|
|
[255]
|