mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +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
168 lines
5.0 KiB
Perl
168 lines
5.0 KiB
Perl
#chg-compatible
|
|
|
|
$ enable amend commitcloud infinitepush rebase remotenames pullcreatemarkers
|
|
$ configure dummyssh
|
|
$ setconfig commitcloud.hostname=testhost
|
|
$ setconfig remotefilelog.reponame=server
|
|
|
|
$ hg init server
|
|
$ cd server
|
|
$ setconfig infinitepush.server=yes infinitepush.reponame=testrepo
|
|
$ setconfig infinitepush.indextype=disk infinitepush.storetype=disk
|
|
$ touch base
|
|
$ hg commit -Aqm base
|
|
$ hg bookmark master
|
|
$ hg debugmakepublic .
|
|
$ cd ..
|
|
|
|
$ hg clone ssh://user@dummy/server client1 -q
|
|
$ cd client1
|
|
$ 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 * (glob)
|
|
$ echo data > file
|
|
$ hg commit -Aqm "draft-commit
|
|
> Differential Revision: https://phabricator.fb.com/D1234"
|
|
$ hg book foo
|
|
$ hg prev -q
|
|
[df4f53] base
|
|
$ hg cloud sync -q
|
|
$ cd ..
|
|
|
|
$ hg clone ssh://user@dummy/server client2 -q
|
|
$ cd client2
|
|
$ 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'
|
|
pulling 00422fad0026 from ssh://user@dummy/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ tglogp
|
|
o 1: 00422fad0026 draft 'draft-commit
|
|
| Differential Revision: https://phabricator.fb.com/D1234' foo
|
|
@ 0: df4f53cec30a public 'base'
|
|
|
|
$ cd ..
|
|
|
|
Fake land the commit
|
|
$ cd server
|
|
$ echo 1 > serverfile
|
|
$ hg commit -Aqm public-commit-1
|
|
$ echo data > file
|
|
$ hg commit -Aqm "landed-commit
|
|
> Differential Revision: https://phabricator.fb.com/D1234"
|
|
$ echo 2 > serverfile
|
|
$ hg commit -Aqm public-commit-2
|
|
$ hg debugmakepublic .
|
|
$ cd ..
|
|
|
|
$ cd client1
|
|
$ hg pull
|
|
pulling from ssh://user@dummy/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 2 changes to 2 files
|
|
$ tglogp
|
|
o 4: 67d363c9001e public 'public-commit-2'
|
|
|
|
|
o 3: 441f69264760 public 'landed-commit
|
|
| Differential Revision: https://phabricator.fb.com/D1234'
|
|
o 2: 031d760782fb public 'public-commit-1'
|
|
|
|
|
| x 1: 00422fad0026 draft 'draft-commit
|
|
|/ Differential Revision: https://phabricator.fb.com/D1234' foo
|
|
@ 0: df4f53cec30a public 'base'
|
|
|
|
$ hg cloud sync -q
|
|
$ cd ../client2
|
|
$ hg cloud sync -q
|
|
$ tglogp
|
|
o 1: 00422fad0026 draft 'draft-commit
|
|
| Differential Revision: https://phabricator.fb.com/D1234' foo
|
|
@ 0: df4f53cec30a public 'base'
|
|
|
|
|
|
Rebasing the bookmark will make the draft commit disappear.
|
|
|
|
$ cd ../client1
|
|
$ hg rebase -b foo -d 67d363c9001e1d7227625f0fa5004aca4572d214
|
|
note: not rebasing 00422fad0026 "draft-commit" (foo), already in destination as 441f69264760 "landed-commit"
|
|
$ tglogp
|
|
o 4: 67d363c9001e public 'public-commit-2' foo
|
|
|
|
|
o 3: 441f69264760 public 'landed-commit
|
|
| Differential Revision: https://phabricator.fb.com/D1234'
|
|
o 2: 031d760782fb public 'public-commit-1'
|
|
|
|
|
@ 0: df4f53cec30a public 'base'
|
|
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ tglogp
|
|
o 4: 67d363c9001e public 'public-commit-2' foo
|
|
|
|
|
o 3: 441f69264760 public 'landed-commit
|
|
| Differential Revision: https://phabricator.fb.com/D1234'
|
|
o 2: 031d760782fb public 'public-commit-1'
|
|
|
|
|
@ 0: df4f53cec30a public 'base'
|
|
|
|
Sync in client2. This will omit the bookmark because we don't have the landed commit.
|
|
|
|
$ cd ../client2
|
|
$ hg cloud sync -q
|
|
67d363c9001e1d7227625f0fa5004aca4572d214 not found, omitting foo bookmark
|
|
$ tglogp
|
|
@ 0: df4f53cec30a public 'base'
|
|
|
|
Pull so that we have the public commit and sync again.
|
|
|
|
$ hg pull
|
|
pulling from ssh://user@dummy/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 2 changes to 2 files
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
The draft commit is also gone from here, and the workspace is stable.
|
|
|
|
$ tglogp
|
|
o 4: 67d363c9001e public 'public-commit-2' foo
|
|
|
|
|
o 3: 441f69264760 public 'landed-commit
|
|
| Differential Revision: https://phabricator.fb.com/D1234'
|
|
o 2: 031d760782fb public 'public-commit-1'
|
|
|
|
|
@ 0: df4f53cec30a public 'base'
|
|
|
|
|
|
$ cd ../client1
|
|
$ hg cloud sync -q
|
|
$ tglogp
|
|
o 4: 67d363c9001e public 'public-commit-2' foo
|
|
|
|
|
o 3: 441f69264760 public 'landed-commit
|
|
| Differential Revision: https://phabricator.fb.com/D1234'
|
|
o 2: 031d760782fb public 'public-commit-1'
|
|
|
|
|
@ 0: df4f53cec30a public 'base'
|
|
|