mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
f2a68e1174
Summary: When selective pull will be enabled, `hg log` won't be able to show any information about the remote bookmarks that are not in subscriptions for particular user. So we need to hint the user that they may want to explicitly pull the remote bookmark first, if hg log fails to find it. Reviewed By: quark-zju Differential Revision: D15516462 fbshipit-source-id: 5be77b0048d8e175a737f76a8e89768f4c837f60
215 lines
7.7 KiB
Perl
215 lines
7.7 KiB
Perl
#if no-windows no-osx
|
|
$ setconfig extensions.treemanifest=!
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -d "0 0" -m "$1"
|
|
> }
|
|
$ . "$TESTDIR/infinitepush/library.sh"
|
|
$ setupcommon
|
|
|
|
With no configuration it should abort
|
|
$ hg init server
|
|
$ cd server
|
|
$ setupsqlserverhgrc babar
|
|
$ hg st
|
|
abort: please set infinitepush.sqlhost
|
|
[255]
|
|
$ setupdb
|
|
$ cd ..
|
|
$ hg clone -q ssh://user@dummy/server client1
|
|
$ hg clone -q ssh://user@dummy/server client2
|
|
$ cd client1
|
|
$ setupsqlclienthgrc
|
|
$ cd ../client2
|
|
$ setupsqlclienthgrc
|
|
$ cd ../client1
|
|
$ mkcommit scratchcommit
|
|
|
|
$ hg push -r . --to scratch/book --create
|
|
pushing to ssh://user@dummy/server
|
|
searching for changes
|
|
remote: pushing 1 commit:
|
|
remote: 2d9cfa751213 scratchcommit
|
|
|
|
Make pull and check that scratch commit is not pulled
|
|
$ cd ../client2
|
|
$ hg pull
|
|
pulling from ssh://user@dummy/server
|
|
no changes found
|
|
$ hg log -r scratch/book
|
|
abort: unknown revision 'scratch/book'!
|
|
(if scratch/book is a remote bookmark or commit, try to 'hg pull' it first)
|
|
[255]
|
|
|
|
Pull scratch commit from the second client
|
|
$ hg pull -B scratch/book
|
|
pulling from ssh://user@dummy/server
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets 2d9cfa751213
|
|
$ hg up scratch/book
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark scratch/book)
|
|
$ hg log -G
|
|
@ changeset: 0:2d9cfa751213
|
|
bookmark: scratch/book
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: scratchcommit
|
|
|
|
$ cd ../server
|
|
$ hg book scratch/%erversidebook
|
|
$ hg book serversidebook
|
|
$ cd ../client1
|
|
$ hg book --list-remote 'scratch/*'
|
|
scratch/%erversidebook 0000000000000000000000000000000000000000
|
|
scratch/book 2d9cfa7512136a84a6edb6a7c288145229c2ef7f
|
|
$ hg book --list-remote 'scratch/%*'
|
|
scratch/%erversidebook 0000000000000000000000000000000000000000
|
|
$ mysql -h $DBHOST -P $DBPORT -D $DBNAME -u $DBUSER $DBPASSOPT -e 'select * from nodesmetadata'
|
|
node message p1 p2 author committer author_date committer_date reponame optional_json_metadata
|
|
2d9cfa7512136a84a6edb6a7c288145229c2ef7f scratchcommit 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 test test 0 0 babar NULL
|
|
$ cd ../server
|
|
$ hg debugfillinfinitepushmetadata --node 2d9cfa7512136a84a6edb6a7c288145229c2ef7f
|
|
$ mysql -h $DBHOST -P $DBPORT -D $DBNAME -u $DBUSER $DBPASSOPT -e 'select * from nodesmetadata'
|
|
node message p1 p2 author committer author_date committer_date reponame optional_json_metadata
|
|
2d9cfa7512136a84a6edb6a7c288145229c2ef7f scratchcommit 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 test test 0 0 babar {"changed_files": {"scratchcommit": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}}
|
|
|
|
$ cd ../
|
|
$ rm -rf client1 && rm -rf client2
|
|
|
|
Test ordering of hosts and reporoot in pullbackup
|
|
Expected result:
|
|
repo roots must be ordered in MRU order (the way the the most recent used come first)
|
|
Since bookmarkstonode mysql table uses '`time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'
|
|
with second resolution instead of an AUTO_INCREMENT column,
|
|
sleeps should be used to get predictable order
|
|
$ hg clone -q ssh://user@dummy/server client1
|
|
$ cd client1 && setupsqlclienthgrc
|
|
$ mkcommit 'Commit in repo client1'
|
|
$ sleep 1
|
|
$ hg cloud backup -q --config infinitepushbackup.hostname=mydevhost
|
|
$ cd ..
|
|
$ hg clone -q ssh://user@dummy/server 'client2\dev'
|
|
$ cd 'client2\dev' && setupsqlclienthgrc
|
|
$ mkcommit 'Commit in repo client2\dev'
|
|
$ sleep 1
|
|
$ hg cloud backup -q --config infinitepushbackup.hostname=devhost
|
|
$ cd ..
|
|
$ hg clone -q ssh://user@dummy/server client3
|
|
$ cd client3 && setupsqlclienthgrc
|
|
$ mkcommit 'Commit in repo client3'
|
|
$ sleep 1
|
|
$ hg cloud backup -q --config infinitepushbackup.hostname=devhost
|
|
$ cd ..
|
|
$ hg clone -q ssh://user@dummy/server client4
|
|
$ cd client4 && setupsqlclienthgrc
|
|
$ mkcommit 'Commit in repo client4'
|
|
$ sleep 1
|
|
$ hg cloud backup -q --config infinitepushbackup.hostname=ourdevhost
|
|
$ cd ..
|
|
$ hg clone -q ssh://user@dummy/server client5
|
|
$ cd client5 && setupsqlclienthgrc
|
|
$ mkcommit 'Commit in repo client5'
|
|
$ sleep 1
|
|
$ hg cloud backup -q --config infinitepushbackup.hostname=mydevhost
|
|
$ hg cloud restorebackup --config infinitepushbackup.backuplistlimit=3
|
|
user test has 5 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
$TESTTMP/client5 on mydevhost
|
|
$TESTTMP/client4 on ourdevhost
|
|
$TESTTMP/client3 on devhost
|
|
(older backups have been hidden, run 'hg cloud listbackups --all' to see them all)
|
|
abort: multiple backups found
|
|
(set --hostname and --reporoot to pick a backup)
|
|
[255]
|
|
$ hg cloud restorebackup --hostname mydevhost
|
|
user test has 2 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
$TESTTMP/client5 on mydevhost
|
|
$TESTTMP/client1 on mydevhost
|
|
abort: multiple backups found
|
|
(set --hostname and --reporoot to pick a backup)
|
|
[255]
|
|
$ hg cloud restorebackup --reporoot $TESTTMP/client1 --hostname mydevhost -q # pullbackup should work with reporoot/hostname pair
|
|
$ hg cloud restorebackup --reporoot $TESTTMP/'client2\dev' --hostname devhost -q # pullbackup should work with reporoot/hostname pair
|
|
$ hg cloud restorebackup --reporoot $TESTTMP/client3 -q # pullbackup should work with reporoot only if it is unambiguous
|
|
$ hg cloud restorebackup --hostname ourdevhost -q # pullbackup should work with hostname only if it is unambiguous
|
|
$ hg log -G --template "{node|short} '{desc}'\n"
|
|
o 3309f3c00117 'Commit in repo client4'
|
|
|
|
o 8b99f4b01a41 'Commit in repo client3'
|
|
|
|
o f9fdbb60b59e 'Commit in repo client2\dev'
|
|
|
|
o 250e5455acab 'Commit in repo client1'
|
|
|
|
@ ec33790d6769 'Commit in repo client5'
|
|
|
|
|
|
hg cloud listbackups should also go in MRU order
|
|
$ hg cloud listbackups --json
|
|
{
|
|
"mydevhost": [
|
|
"$TESTTMP/client5",
|
|
"$TESTTMP/client1"
|
|
],
|
|
"ourdevhost": [
|
|
"$TESTTMP/client4"
|
|
],
|
|
"devhost": [
|
|
"$TESTTMP/client3",
|
|
"$TESTTMP/client2\\dev"
|
|
]
|
|
}
|
|
$ hg cloud listbackups
|
|
user test has 5 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
$TESTTMP/client5 on mydevhost
|
|
$TESTTMP/client4 on ourdevhost
|
|
$TESTTMP/client3 on devhost
|
|
$TESTTMP/client2\dev on devhost
|
|
$TESTTMP/client1 on mydevhost
|
|
|
|
$ cd ../
|
|
$ rm -rf client*
|
|
|
|
Test of creation and later removal a bookmark that ends with '*'
|
|
Extected that the bookmark 'feature1' will mot be removed and
|
|
safely will be restored on the client2
|
|
$ hg clone -q ssh://user@dummy/server client1
|
|
$ hg clone -q ssh://user@dummy/server client2
|
|
$ cd client1 && setupsqlclienthgrc && cd ..
|
|
$ cd client2 && setupsqlclienthgrc && cd ..
|
|
$ cd client1
|
|
$ mkcommit 'Test commit1'
|
|
$ hg bookmark 'feature1'
|
|
$ sleep 1
|
|
$ mkcommit 'Test commit2'
|
|
$ hg up '.^'
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(leaving bookmark feature1)
|
|
$ hg bookmark '*'
|
|
$ sleep 1
|
|
$ hg log -G --template "{node|short} {bookmarks} '{desc}'\n"
|
|
o 679ff862f673 feature1 'Test commit2'
|
|
|
|
|
@ bf45ce9ee037 * 'Test commit1'
|
|
|
|
$ hg cloud backup -q --config infinitepushbackup.hostname=testhost
|
|
$ hg bookmark '*' --delete
|
|
$ hg cloud backup -q --config infinitepushbackup.hostname=testhost
|
|
$ cd ../client2
|
|
$ hg cloud restorebackup --hostname testhost -q
|
|
$ hg log -G --template "{node|short} {bookmarks} '{desc}'\n"
|
|
o 679ff862f673 feature1 'Test commit2'
|
|
|
|
|
o bf45ce9ee037 'Test commit1'
|
|
|
|
|
|
#endif
|