mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
84280e36c3
Summary: Remove selectivepullaccessedbookmarks feature because it contains bugs and causes many undesired issues. This was added to migrate existing repos to selective pull and is not needed anymore. Main effects are: * if you enable selectivepull for an existing repo, it won't reduce number of subscribed bookmarks. * some operations like `hg push` or `hg pull -r` in their underlying implementation update all subscribed bookmarks, not just accessed like before. This drives changes to the tests. Reminder, the bookmark has been marked as "accessed" if the repo has been ever updated to that bookmark. All tests fixed accordingly. Reviewed By: markbt Differential Revision: D26460435 fbshipit-source-id: f839b9f207bfc478a0336ec807b720d35a0bb12e
202 lines
4.9 KiB
Raku
202 lines
4.9 KiB
Raku
#chg-compatible
|
|
|
|
$ enable amend commitcloud infinitepush remotenames
|
|
$ configure dummyssh
|
|
$ setconfig commitcloud.hostname=testhost
|
|
$ setconfig remotefilelog.reponame=server
|
|
|
|
$ showgraph() {
|
|
> hg log -G -T "{desc}: {phase} {bookmarks} {remotenames}" -r "all()"
|
|
> }
|
|
|
|
$ newserver server
|
|
$ cd $TESTTMP/server
|
|
$ echo base > base
|
|
$ hg commit -Aqm base
|
|
$ hg bookmark base
|
|
$ hg bookmark master
|
|
$ setconfig infinitepush.server=yes infinitepush.reponame=testrepo
|
|
$ setconfig infinitepush.indextype=disk infinitepush.storetype=disk
|
|
|
|
Set remotebookmarkssync True initially for the first repo and False for the second repo
|
|
|
|
$ cd $TESTTMP
|
|
$ clone server client1
|
|
$ cd client1
|
|
$ setconfig remotenames.selectivepull=True
|
|
$ setconfig remotenames.selectivepulldefault=master,base
|
|
$ setconfig commitcloud.remotebookmarkssync=True
|
|
$ setconfig commitcloud.servicetype=local commitcloud.servicelocation=$TESTTMP commitcloud.token_enforced=False
|
|
$ hg cloud join
|
|
commitcloud: this repository is now connected to the 'user/test/default' workspace for the 'server' repo
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in 0.00 sec
|
|
$ showgraph
|
|
@ base: public default/base default/master
|
|
|
|
$ cd $TESTTMP
|
|
$ clone server client2
|
|
$ cd client2
|
|
$ setconfig remotenames.selectivepull=True
|
|
$ setconfig remotenames.selectivepulldefault=master,base
|
|
$ setconfig commitcloud.remotebookmarkssync=False
|
|
$ setconfig commitcloud.servicetype=local commitcloud.servicelocation=$TESTTMP commitcloud.token_enforced=False
|
|
$ hg cloud join
|
|
commitcloud: this repository is now connected to the 'user/test/default' workspace for the 'server' repo
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in 0.00 sec
|
|
$ showgraph
|
|
@ base: public default/base default/master
|
|
|
|
|
|
Advance master
|
|
$ cd $TESTTMP/server
|
|
$ echo more >> base
|
|
$ hg commit -Aqm public1
|
|
|
|
Pull in client1 (remote bookmarks sync enabled)
|
|
$ cd $TESTTMP/client1
|
|
$ hg pull -q
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o public1: public default/master
|
|
│
|
|
@ base: public default/base
|
|
|
|
|
|
Sync in client2 (remote bookmarks sync disabled). The master bookmark doesn't move
|
|
$ cd $TESTTMP/client2
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
@ base: public default/base default/master
|
|
|
|
|
|
Sync in client2 with sync enabled
|
|
$ hg cloud sync -q --config commitcloud.remotebookmarkssync=true
|
|
$ showgraph
|
|
o public1: public default/master
|
|
│
|
|
@ base: public default/base
|
|
|
|
|
|
Sync in client1 again.
|
|
$ cd $TESTTMP/client1
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o public1: public default/master
|
|
│
|
|
@ base: public default/base
|
|
|
|
|
|
Sync in client2 again (remote bookmarks sync disabled)
|
|
$ cd $TESTTMP/client2
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o public1: public default/master
|
|
│
|
|
@ base: public default/base
|
|
|
|
|
|
Advance master
|
|
$ cd $TESTTMP/server
|
|
$ echo more >> base
|
|
$ hg commit -Aqm public2
|
|
|
|
Pull in client1 and sync
|
|
$ cd $TESTTMP/client1
|
|
$ hg pull -q
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o public2: public default/master
|
|
│
|
|
o public1: public
|
|
│
|
|
@ base: public default/base
|
|
|
|
|
|
Sync in client 2 with remotebookmarks sync enabled.
|
|
$ cd $TESTTMP/client2
|
|
$ hg cloud sync -q --config commitcloud.remotebookmarkssync=true
|
|
$ showgraph
|
|
o public2: public default/master
|
|
│
|
|
o public1: public
|
|
│
|
|
@ base: public default/base
|
|
|
|
|
|
Delete the base bookmark on the server
|
|
$ cd $TESTTMP/server
|
|
$ hg book -d base
|
|
|
|
Pull in client 1, which removes the base remote bookmark
|
|
$ cd $TESTTMP/client1
|
|
$ hg pull -q
|
|
$ showgraph
|
|
o public2: public default/master
|
|
│
|
|
o public1: public
|
|
│
|
|
@ base: public
|
|
|
|
|
|
Make an update to the cloud workspace in client 2 with remotebookmarks sync disabled
|
|
$ cd $TESTTMP/client2
|
|
$ hg book local1
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o public2: public default/master
|
|
│
|
|
o public1: public
|
|
│
|
|
@ base: public local1 default/base
|
|
|
|
|
|
Sync in client1, deleted base bookmark remains deleted
|
|
$ cd $TESTTMP/client1
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o public2: public default/master
|
|
│
|
|
o public1: public
|
|
│
|
|
@ base: public local1
|
|
|
|
|
|
Sync in client2 with remote bookmarks sync enabled
|
|
$ cd $TESTTMP/client2
|
|
$ hg cloud sync -q --config commitcloud.remotebookmarkssync=true
|
|
$ showgraph
|
|
o public2: public default/master
|
|
│
|
|
o public1: public
|
|
│
|
|
@ base: public local1 default/base
|
|
|
|
Pull in client 2, base bookmark is now deleted
|
|
$ hg pull
|
|
pulling from ssh://user@dummy/server
|
|
no changes found
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o public2: public default/master
|
|
│
|
|
o public1: public
|
|
│
|
|
@ base: public local1
|
|
|
|
|
|
And remains deleted in client 1
|
|
$ cd $TESTTMP/client1
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o public2: public default/master
|
|
│
|
|
o public1: public
|
|
│
|
|
@ base: public local1
|
|
|
|
|
|
-- |