mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
455 lines
14 KiB
Perl
455 lines
14 KiB
Perl
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License found in the LICENSE file in the root
|
|
# directory of this source tree.
|
|
|
|
$ . "${TEST_FIXTURES}/library.sh"
|
|
$ BLOB_TYPE="blob_files" default_setup
|
|
hg repo
|
|
o C [draft;rev=2;26805aba1e60]
|
|
|
|
|
o B [draft;rev=1;112478962961]
|
|
|
|
|
o A [draft;rev=0;426bada5c675]
|
|
$
|
|
blobimporting
|
|
starting Mononoke
|
|
cloning repo in hg client 'repo2'
|
|
|
|
|
|
Pushrebase commit 1
|
|
$ hg up -q 0
|
|
$ echo 1 > 1 && hg add 1 && hg ci -m 1
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev a0c9c5791058 to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files
|
|
updating bookmark master_bookmark
|
|
|
|
$ hgmn up master_bookmark
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ log -r ":"
|
|
@ 1 [public;rev=4;c2e526aacb51] default/master_bookmark
|
|
|
|
|
| o 1 [draft;rev=3;a0c9c5791058]
|
|
| |
|
|
o | C [public;rev=2;26805aba1e60]
|
|
| |
|
|
o | B [public;rev=1;112478962961]
|
|
|/
|
|
o A [public;rev=0;426bada5c675]
|
|
$
|
|
|
|
Check that the filenode for 1 does not point to the draft commit in a new clone
|
|
$ cd ..
|
|
$ hgclone_treemanifest ssh://user@dummy/repo-hg repo3 --noupdate --config extensions.remotenames= -q
|
|
$ cd repo3
|
|
$ setup_hg_client
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase =
|
|
> remotenames =
|
|
> EOF
|
|
|
|
$ hgmn pull -r master_bookmark
|
|
pulling from ssh://user@dummy/repo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files
|
|
$ hgmn up master_bookmark
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hgmn debugsh -c 'ui.write("%s\n" % m.node.hex(repo["."].filectx("1").getnodeinfo()[2]))'
|
|
c2e526aacb5100b7c1ddb9b711d2e012e6c69cda
|
|
$ cd ../repo2
|
|
|
|
Push rebase fails with conflict in the bottom of the stack
|
|
$ hg up -q 0
|
|
$ echo 1 > 1 && hg add 1 && hg ci -m 1
|
|
$ echo 2 > 2 && hg add 2 && hg ci -m 2
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev * to destination ssh://user@dummy/repo bookmark master_bookmark (glob)
|
|
searching for changes
|
|
remote: Command failed
|
|
remote: Error:
|
|
remote: * pushrebase failed * (glob)
|
|
remote: Root cause:
|
|
remote: "pushrebase failed Conflicts([PushrebaseConflict { left: MPath(\"1\"), right: MPath(\"1\") }])"
|
|
abort: * (glob)
|
|
[255]
|
|
$ hg hide -r ".^ + ." -q
|
|
|
|
|
|
Push rebase fails with conflict in the top of the stack
|
|
$ hg up -q 0
|
|
$ echo 2 > 2 && hg add 2 && hg ci -m 2
|
|
$ echo 1 > 1 && hg add 1 && hg ci -m 1
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev * to destination ssh://user@dummy/repo bookmark master_bookmark (glob)
|
|
searching for changes
|
|
remote: Command failed
|
|
remote: Error:
|
|
remote: * pushrebase failed * (glob)
|
|
remote: Root cause:
|
|
remote: "pushrebase failed Conflicts([PushrebaseConflict { left: MPath(\"1\"), right: MPath(\"1\") }])"
|
|
abort: * (glob)
|
|
[255]
|
|
$ hg hide -r ".^ + ." -q
|
|
|
|
|
|
Push stack
|
|
$ hg up -q 0
|
|
$ echo 3 > 3 && hg add 3 && hg ci -m 3
|
|
$ echo 4 > 4 && hg add 4 && hg ci -m 4
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev 7a68f123d810 to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 0 changes to 0 files
|
|
updating bookmark master_bookmark
|
|
$ hg hide -r ".^ + ." -q
|
|
$ hgmn up -q master_bookmark
|
|
$ log -r ":"
|
|
@ 4 [public;rev=11;4f5a4463b24b] default/master_bookmark
|
|
|
|
|
o 3 [public;rev=10;7796136324ad]
|
|
|
|
|
o 1 [public;rev=4;c2e526aacb51]
|
|
|
|
|
o C [public;rev=2;26805aba1e60]
|
|
|
|
|
o B [public;rev=1;112478962961]
|
|
|
|
|
o A [public;rev=0;426bada5c675]
|
|
$
|
|
|
|
Push fast-forward
|
|
$ hg up master_bookmark
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo 5 > 5 && hg add 5 && hg ci -m 5
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev 59e5396444cf to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 0 changesets with 0 changes to 0 files
|
|
updating bookmark master_bookmark
|
|
$ log -r ":"
|
|
@ 5 [public;rev=12;59e5396444cf] default/master_bookmark
|
|
|
|
|
o 4 [public;rev=11;4f5a4463b24b]
|
|
|
|
|
o 3 [public;rev=10;7796136324ad]
|
|
|
|
|
o 1 [public;rev=4;c2e526aacb51]
|
|
|
|
|
o C [public;rev=2;26805aba1e60]
|
|
|
|
|
o B [public;rev=1;112478962961]
|
|
|
|
|
o A [public;rev=0;426bada5c675]
|
|
$
|
|
|
|
|
|
Push with no new commits
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev 59e5396444cf to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
no changes found
|
|
updating bookmark master_bookmark
|
|
[1]
|
|
$ log -r "."
|
|
@ 5 [public;rev=12;59e5396444cf] default/master_bookmark
|
|
|
|
|
~
|
|
|
|
Push a merge commit with both parents not ancestors of destination bookmark
|
|
$ hg up -q 1
|
|
$ echo 6 > 6 && hg add 6 && hg ci -m 6
|
|
$ hg up -q 1
|
|
$ echo 7 > 7 && hg add 7 && hg ci -m 7
|
|
$ hg merge -q -r 13 && hg ci -m "merge 6 and 7"
|
|
$ log -r ":"
|
|
@ merge 6 and 7 [draft;rev=15;fad460d85200]
|
|
|\
|
|
| o 7 [draft;rev=14;299aa3fbbd3f]
|
|
| |
|
|
o | 6 [draft;rev=13;55337b4265b3]
|
|
|/
|
|
| o 5 [public;rev=12;59e5396444cf] default/master_bookmark
|
|
| |
|
|
| o 4 [public;rev=11;4f5a4463b24b]
|
|
| |
|
|
| o 3 [public;rev=10;7796136324ad]
|
|
| |
|
|
| o 1 [public;rev=4;c2e526aacb51]
|
|
| |
|
|
| o C [public;rev=2;26805aba1e60]
|
|
|/
|
|
o B [public;rev=1;112478962961]
|
|
|
|
|
o A [public;rev=0;426bada5c675]
|
|
$
|
|
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev fad460d85200 to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 0 changes to 0 files
|
|
updating bookmark master_bookmark
|
|
$ hgmn up master_bookmark -q && hg hide -r "13+14+15" -q
|
|
$ log -r ":"
|
|
@ merge 6 and 7 [public;rev=18;4a0002072071] default/master_bookmark
|
|
|\
|
|
\| o (6|7) \[public;rev=17;.*\] (re)
|
|
| |
|
|
o \| (7|6) \[public;rev=16;.*\] (re)
|
|
|/
|
|
o 5 [public;rev=12;59e5396444cf]
|
|
|
|
|
o 4 [public;rev=11;4f5a4463b24b]
|
|
|
|
|
o 3 [public;rev=10;7796136324ad]
|
|
|
|
|
o 1 [public;rev=4;c2e526aacb51]
|
|
|
|
|
o C [public;rev=2;26805aba1e60]
|
|
|
|
|
o B [public;rev=1;112478962961]
|
|
|
|
|
o A [public;rev=0;426bada5c675]
|
|
$
|
|
|
|
|
|
Previously commits below were testing pushrebasing over merge.
|
|
Keep them in place to not change the output for all the tests below
|
|
$ hgmn up 11 -q
|
|
$ echo 8 > 8 && hg add 8 && hg ci -m 8
|
|
$ hgmn up master_bookmark -q
|
|
|
|
Push-rebase of a commit with p2 being the ancestor of the destination bookmark
|
|
- Do some preparatory work
|
|
$ echo 9 > 9 && hg add 9 && hg ci -m 9
|
|
$ echo 10 > 10 && hg add 10 && hg ci -m 10
|
|
$ echo 11 > 11 && hg add 11 && hg ci -m 11
|
|
$ hgmn push -r . --to master_bookmark -q
|
|
$ hgmn up .^^ && echo 12 > 12 && hg add 12 && hg ci -m 12
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
$ hg log -r master_bookmark -T '{node}\n'
|
|
589551466f2555a4d90ca544b23273a2eed21f9d
|
|
|
|
$ hg merge -qr 21 && hg ci -qm "merge 10 and 12"
|
|
$ hg phase -r $(hg log -r . -T "{p1node}")
|
|
cd5aac4439e50d4329539ac117bfb3e35d7fb74b: draft
|
|
$ hg phase -r $(hg log -r . -T "{p2node}")
|
|
c573a92e1179f7367f4e4a51689d097bb84842ab: public
|
|
$ hg log -r master_bookmark -T '{node}\n'
|
|
589551466f2555a4d90ca544b23273a2eed21f9d
|
|
|
|
- Actually test the push
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev e3db177db1d1 to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files
|
|
updating bookmark master_bookmark
|
|
$ hg hide -r . -q && hgmn up master_bookmark -q
|
|
$ hg log -r master_bookmark -T '{node}\n'
|
|
eb388b759fde98ed5b1e05fd2da5309f3762c2fd
|
|
Test creating a bookmark on a public commit
|
|
$ hgmn push --rev 25 --to master_bookmark_2 --create
|
|
pushing rev eb388b759fde to destination ssh://user@dummy/repo bookmark master_bookmark_2
|
|
searching for changes
|
|
no changes found
|
|
exporting bookmark master_bookmark_2
|
|
[1]
|
|
$ log -r "20::"
|
|
@ merge 10 and 12 [public;rev=25;eb388b759fde] default/master_bookmark default/master_bookmark_2
|
|
|\
|
|
| o 12 [public;rev=23;cd5aac4439e5]
|
|
| |
|
|
o | 11 [public;rev=22;589551466f25]
|
|
| |
|
|
o | 10 [public;rev=21;c573a92e1179]
|
|
|/
|
|
o 9 [public;rev=20;2f7cc50dc4e5]
|
|
|
|
|
~
|
|
|
|
Test a non-forward push
|
|
$ hgmn up 22 -q
|
|
$ log -r "20::"
|
|
o merge 10 and 12 [public;rev=25;eb388b759fde] default/master_bookmark default/master_bookmark_2
|
|
|\
|
|
| o 12 [public;rev=23;cd5aac4439e5]
|
|
| |
|
|
@ | 11 [public;rev=22;589551466f25]
|
|
| |
|
|
o | 10 [public;rev=21;c573a92e1179]
|
|
|/
|
|
o 9 [public;rev=20;2f7cc50dc4e5]
|
|
|
|
|
~
|
|
$ hgmn push --force -r . --to master_bookmark_2 --non-forward-move --pushvar NON_FAST_FORWARD=true
|
|
pushing rev 589551466f25 to destination ssh://user@dummy/repo bookmark master_bookmark_2
|
|
searching for changes
|
|
no changes found
|
|
updating bookmark master_bookmark_2
|
|
[1]
|
|
$ log -r "20::"
|
|
o merge 10 and 12 [public;rev=25;eb388b759fde] default/master_bookmark
|
|
|\
|
|
| o 12 [public;rev=23;cd5aac4439e5]
|
|
| |
|
|
@ | 11 [public;rev=22;589551466f25] default/master_bookmark_2
|
|
| |
|
|
o | 10 [public;rev=21;c573a92e1179]
|
|
|/
|
|
o 9 [public;rev=20;2f7cc50dc4e5]
|
|
|
|
|
~
|
|
|
|
Test deleting a bookmark
|
|
$ hgmn push --delete master_bookmark_2
|
|
pushing to ssh://user@dummy/repo
|
|
searching for changes
|
|
no changes found
|
|
deleting remote bookmark master_bookmark_2
|
|
[1]
|
|
$ log -r "20::"
|
|
o merge 10 and 12 [public;rev=25;eb388b759fde] default/master_bookmark
|
|
|\
|
|
| o 12 [public;rev=23;cd5aac4439e5]
|
|
| |
|
|
@ | 11 [public;rev=22;589551466f25]
|
|
| |
|
|
o | 10 [public;rev=21;c573a92e1179]
|
|
|/
|
|
o 9 [public;rev=20;2f7cc50dc4e5]
|
|
|
|
|
~
|
|
|
|
Test creating a bookmark and new head
|
|
$ echo draft > draft && hg add draft && hg ci -m draft
|
|
$ hgmn push -r . --to newbook --create
|
|
pushing rev 7a037594e202 to destination ssh://user@dummy/repo bookmark newbook
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 0 changesets with 0 changes to 0 files
|
|
exporting bookmark newbook
|
|
|
|
Test non-fast-forward force pushrebase
|
|
$ hgmn up -qr 20
|
|
$ echo Aeneas > was_a_lively_fellow && hg ci -qAm 26
|
|
$ log -r "20::"
|
|
@ 26 [draft;rev=27;4899f9112d9b]
|
|
|
|
|
| o draft [public;rev=26;7a037594e202] default/newbook
|
|
| |
|
|
| | o merge 10 and 12 [public;rev=25;eb388b759fde] default/master_bookmark
|
|
| |/|
|
|
+---o 12 [public;rev=23;cd5aac4439e5]
|
|
| |
|
|
| o 11 [public;rev=22;589551466f25]
|
|
| |
|
|
| o 10 [public;rev=21;c573a92e1179]
|
|
|/
|
|
o 9 [public;rev=20;2f7cc50dc4e5]
|
|
|
|
|
~
|
|
-- we don't need to pass --pushvar NON_FAST_FORWARD if we're doing a force pushrebase
|
|
$ hgmn push -r . -f --to newbook
|
|
pushing rev 4899f9112d9b to destination ssh://user@dummy/repo bookmark newbook
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 0 changesets with 0 changes to 0 files
|
|
updating bookmark newbook
|
|
$ log -r "20::"
|
|
@ 26 [public;rev=27;4899f9112d9b] default/newbook
|
|
|
|
|
| o draft [public;rev=26;7a037594e202]
|
|
| |
|
|
| | o merge 10 and 12 [public;rev=25;eb388b759fde] default/master_bookmark
|
|
| |/|
|
|
+---o 12 [public;rev=23;cd5aac4439e5]
|
|
| |
|
|
| o 11 [public;rev=22;589551466f25]
|
|
| |
|
|
| o 10 [public;rev=21;c573a92e1179]
|
|
|/
|
|
o 9 [public;rev=20;2f7cc50dc4e5]
|
|
|
|
|
~
|
|
|
|
-- Check that pulling a force pushrebase has good linknodes.
|
|
$ cd ../repo3
|
|
$ hgmn pull -r newbook
|
|
pulling from ssh://user@dummy/repo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 8 changesets with 0 changes to 0 files
|
|
$ hgmn up newbook
|
|
7 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hgmn debugsh -c 'ui.write("%s\n" % m.node.hex(repo["."].filectx("was_a_lively_fellow").getnodeinfo()[2]))'
|
|
4899f9112d9b79c3ecbc343169db37fbe1efdd20
|
|
$ cd ../repo2
|
|
|
|
-- Check that a force pushrebase with mutation markers is a fail
|
|
$ echo SPARTACUS > sum_ego && hg ci -qAm 27
|
|
$ echo SPARTACUS! > sum_ego && hg amend --config mutation.enabled=true --config mutation.record=true
|
|
$ hgmn push -r . -f --to newbook
|
|
pushing rev * to destination ssh://user@dummy/repo bookmark newbook (glob)
|
|
searching for changes
|
|
remote: Command failed
|
|
remote: Error:
|
|
remote: Forced push blocked because it contains mutation metadata.
|
|
remote: You can remove the metadata from a commit with `hg amend --config mutation.record=false`.
|
|
remote: For more help, please contact the Source Control team at https://fburl.com/27qnuyl2
|
|
remote: Root cause:
|
|
remote: "Forced push blocked because it contains mutation metadata.\nYou can remove the metadata from a commit with `hg amend --config mutation.record=false`.\nFor more help, please contact the Source Control team at https://fburl.com/27qnuyl2"
|
|
abort: stream ended unexpectedly (got 0 bytes, expected 4)
|
|
[255]
|
|
|
|
Check that we can replace a file with a directory
|
|
$ cd "$TESTTMP/repo2"
|
|
$ hgmn up default/newbook -q
|
|
$ hg rm A -q
|
|
$ mkdir A
|
|
$ echo hello > A/hello
|
|
$ hgmn add A/hello -q
|
|
$ hgmn ci -qm "replace a file with a dir"
|
|
$ hgmn push --to newbook
|
|
pushing rev 4e5fec14573f to destination ssh://user@dummy/repo bookmark newbook
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 0 changesets with 0 changes to 0 files
|
|
updating bookmark newbook
|
|
|
|
$ ls A
|
|
hello
|
|
$ log -r "30"
|
|
@ replace a file with a dir [public;rev=30;4e5fec14573f] default/newbook
|
|
|
|
|
~
|
|
|