mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
cc2b5c04ca
Summary: There have been lots of issues with user experience related to authentication and its help messages. Just one of it: certs are configured to be used for authentication and they are invalid but the `hg cloud auth` command will provide help message about the certs but then ask to copy and paste a token from the code about interactive token obtaining. Another thing, is certs are configired to use, it was not hard to set up a token for Scm Daemon that can be still on tokens even if cloud sync uses certs. Now it is possible with `hg auth -t <token>` command Now it should be more cleaner and all the messages should be cleaner as well. Also certs related help message has been improved. Also all tests were cleaned up from the authentication except for the main test. This is to simplify the tests. Reviewed By: mitrandir77 Differential Revision: D22866731 fbshipit-source-id: 61dd4bffa6fcba39107be743fb155be0970c4266
203 lines
4.9 KiB
Raku
203 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 "{rev} {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
|
|
|
|
$ cd $TESTTMP
|
|
$ clone server client1
|
|
$ cd client1
|
|
$ setconfig remotenames.selectivepull=True
|
|
$ setconfig remotenames.selectivepulldefault=master,base
|
|
$ setconfig remotenames.selectivepullaccessedbookmarks=True
|
|
$ 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
|
|
@ 0 base: public default/base default/master
|
|
|
|
$ cd $TESTTMP
|
|
$ clone server client2
|
|
$ cd client2
|
|
$ setconfig remotenames.selectivepull=True
|
|
$ setconfig remotenames.selectivepulldefault=master,base
|
|
$ setconfig remotenames.selectivepullaccessedbookmarks=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
|
|
@ 0 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 1 public1: public default/master
|
|
|
|
|
@ 0 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
|
|
o 1 public1: draft
|
|
|
|
|
@ 0 base: public default/base default/master
|
|
|
|
|
|
Sync in client2 with sync enabled
|
|
$ hg cloud sync -q --config commitcloud.remotebookmarkssync=true
|
|
$ showgraph
|
|
o 1 public1: public default/master
|
|
|
|
|
@ 0 base: public default/base
|
|
|
|
|
|
Sync in client1 again.
|
|
$ cd $TESTTMP/client1
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o 1 public1: public default/master
|
|
|
|
|
@ 0 base: public default/base
|
|
|
|
|
|
Sync in client2 again (remote bookmarks sync disabled)
|
|
$ cd $TESTTMP/client2
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o 1 public1: public default/master
|
|
|
|
|
@ 0 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 2 public2: public default/master
|
|
|
|
|
o 1 public1: public
|
|
|
|
|
@ 0 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 2 public2: public default/master
|
|
|
|
|
o 1 public1: public
|
|
|
|
|
@ 0 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 2 public2: public default/master
|
|
|
|
|
o 1 public1: public
|
|
|
|
|
@ 0 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 2 public2: public default/master
|
|
|
|
|
o 1 public1: public
|
|
|
|
|
@ 0 base: public local1 default/base
|
|
|
|
|
|
Sync in client1, deleted base bookmark remains deleted
|
|
$ cd $TESTTMP/client1
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o 2 public2: public default/master
|
|
|
|
|
o 1 public1: public
|
|
|
|
|
@ 0 base: public local1
|
|
|
|
|
|
Sync in client2 with remote bookmarks sync enabled
|
|
$ cd $TESTTMP/client2
|
|
$ hg cloud sync -q --config commitcloud.remotebookmarkssync=true
|
|
$ showgraph
|
|
o 2 public2: public default/master
|
|
|
|
|
o 1 public1: public
|
|
|
|
|
@ 0 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 2 public2: public default/master
|
|
|
|
|
o 1 public1: public
|
|
|
|
|
@ 0 base: public local1
|
|
|
|
|
|
And remains deleted in client 1
|
|
$ cd $TESTTMP/client1
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o 2 public2: public default/master
|
|
|
|
|
o 1 public1: public
|
|
|
|
|
@ 0 base: public local1
|
|
|
|
|
|
-- |