mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 06:47:41 +03:00
e41d5cd495
Summary: Our current `hg pull` in production typically shows: % hg pull pulling from mononoke://... connected to ... session ... imported commit graph for ... commits (1 segment) There is no "added x changesets ..." message. Drop it from tests. This also makes it easier to migrate tests to remotefilelog repos, since with remotefilelog it will show "0 changes to 0 files". Differential Revision: D32570597 fbshipit-source-id: aa660e2cbd9bc07caa74f0126e152589b08e5c57
309 lines
9.9 KiB
Perl
309 lines
9.9 KiB
Perl
#chg-compatible
|
|
$ setconfig experimental.allowfilepeer=True
|
|
|
|
$ configure modern
|
|
$ enable smartlog
|
|
$ showgraph() {
|
|
> hg log -G -T "{desc}: {phase} {bookmarks} {remotenames}" -r "all()"
|
|
> }
|
|
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg commit -Aqm "$1"
|
|
> }
|
|
|
|
$ newserver server
|
|
$ cd $TESTTMP/server
|
|
|
|
$ mkcommit "base"
|
|
$ hg bookmark master
|
|
$ cd ..
|
|
|
|
Make the first clone of the server
|
|
$ clone server client1
|
|
$ cd client1
|
|
$ hg cloud rename -d w1 # renaming of the default one should fail
|
|
abort: rename of the default workspace is not allowed
|
|
[255]
|
|
$ hg cloud leave -q
|
|
$ hg cloud join -w w1
|
|
commitcloud: this repository is now connected to the 'user/test/w1' workspace for the 'server' repo
|
|
commitcloud: synchronizing 'server' with 'user/test/w1'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
$ cd ..
|
|
|
|
Make the second clone of the server
|
|
$ clone server client2
|
|
$ cd client2
|
|
$ mkcommit "A (W2)"
|
|
$ mkcommit "B (W2)"
|
|
$ hg cloud leave -q
|
|
$ hg cloud join -w w2
|
|
commitcloud: this repository is now connected to the 'user/test/w2' workspace for the 'server' repo
|
|
commitcloud: synchronizing 'server' with 'user/test/w2'
|
|
backing up stack rooted at 90a3dff49daa
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
remote: pushing 2 commits:
|
|
remote: 90a3dff49daa A (W2)
|
|
remote: 67590a46a20b B (W2)
|
|
|
|
$ cd ..
|
|
|
|
Make a commit in the first client, and sync it
|
|
$ cd client1
|
|
$ mkcommit "A (W1)"
|
|
$ mkcommit "B (W1)"
|
|
$ hg cloud sync -q
|
|
|
|
$ hg cloud list
|
|
commitcloud: searching workspaces for the 'server' repo
|
|
the following commitcloud workspaces are available:
|
|
default
|
|
w2
|
|
w1 (connected)
|
|
run `hg cloud sl -w <workspace name>` to view the commits
|
|
run `hg cloud switch -w <workspace name>` to switch to a different workspace
|
|
|
|
Rename to the existing workspace should fail
|
|
$ hg cloud rename -d w2
|
|
commitcloud: synchronizing 'server' with 'user/test/w1'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
commitcloud: rename the 'user/test/w1' workspace to 'user/test/w2' for the repo 'server'
|
|
abort: workspace: 'user/test/w2' already exists
|
|
[255]
|
|
|
|
|
|
Rename to a new name should work
|
|
Smartlog and status should stay the same
|
|
$ hg cloud rename -d w3
|
|
commitcloud: synchronizing 'server' with 'user/test/w1'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
commitcloud: rename the 'user/test/w1' workspace to 'user/test/w3' for the repo 'server'
|
|
commitcloud: rename successful
|
|
|
|
$ showgraph
|
|
@ B (W1): draft
|
|
│
|
|
o A (W1): draft
|
|
│
|
|
o base: public remote/master
|
|
|
|
$ hg cloud sync --debug
|
|
commitcloud: synchronizing 'server' with 'user/test/w3'
|
|
commitcloud local service: get_references for current version 2
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
Rename workspace that is not a current one
|
|
$ hg cloud rename -s w2 -d w4
|
|
commitcloud: rename the 'user/test/w2' workspace to 'user/test/w4' for the repo 'server'
|
|
commitcloud: rename successful
|
|
|
|
$ cd ..
|
|
|
|
Move to the second client
|
|
`hg cloud sync` should be broken
|
|
$ cd client2
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/w2'
|
|
abort: 'get_references' failed, the workspace has been renamed or client has an invalid state
|
|
[255]
|
|
$ hg cloud list
|
|
commitcloud: searching workspaces for the 'server' repo
|
|
the following commitcloud workspaces are available:
|
|
default
|
|
w3
|
|
w4
|
|
w2 (connected) (renamed or removed)
|
|
run `hg cloud sl -w <workspace name>` to view the commits
|
|
run `hg cloud switch -w <workspace name>` to switch to a different workspace
|
|
|
|
$ hg cloud status
|
|
Workspace: w2 (renamed or removed) (run `hg cloud list` and switch to a different one)
|
|
Raw Workspace Name: user/test/w2
|
|
Automatic Sync (on local changes): OFF
|
|
Automatic Sync via 'Scm Daemon' (on remote changes): OFF
|
|
Last Sync Version: 1
|
|
Last Sync Heads: 1 (0 omitted)
|
|
Last Sync Bookmarks: 0 (0 omitted)
|
|
Last Sync Remote Bookmarks: 1
|
|
Last Sync Time: * (glob)
|
|
Last Sync Status: Exception:
|
|
'get_references' failed, the workspace has been renamed or client has an invalid state
|
|
|
|
$ hg cloud switch -w w4 --force
|
|
commitcloud: now this repository will be switched from the 'user/test/w2' to the 'user/test/w4' workspace
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
working directory now at d20a80d4def3
|
|
commitcloud: this repository is now connected to the 'user/test/w4' workspace for the 'server' repo
|
|
commitcloud: synchronizing 'server' with 'user/test/w4'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
$ showgraph
|
|
o B (W2): draft
|
|
│
|
|
o A (W2): draft
|
|
│
|
|
@ base: public remote/master
|
|
|
|
|
|
$ hg cloud rename --rehost -d testhost
|
|
abort: 'rehost' option and 'destination' option are incompatible
|
|
[255]
|
|
$ hg cloud rename --rehost
|
|
commitcloud: synchronizing 'server' with 'user/test/w4'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
commitcloud: rename the 'user/test/w4' workspace to 'user/test/testhost' for the repo 'server'
|
|
commitcloud: rename successful
|
|
|
|
$ cd ..
|
|
|
|
Back to client1
|
|
|
|
$ cd client1
|
|
$ hg up master
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
$ hg cloud switch -w testhost # switch to a renamed workspace should work
|
|
commitcloud: synchronizing 'server' with 'user/test/w3'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
commitcloud: now this repository will be switched from the 'user/test/w3' to the 'user/test/testhost' workspace
|
|
commitcloud: this repository is now connected to the 'user/test/testhost' workspace for the 'server' repo
|
|
commitcloud: synchronizing 'server' with 'user/test/testhost'
|
|
pulling 67590a46a20b from ssh://user@dummy/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
$ showgraph
|
|
o B (W2): draft
|
|
│
|
|
o A (W2): draft
|
|
│
|
|
@ base: public remote/master
|
|
|
|
|
|
Try to rename an unknown workspace
|
|
$ hg cloud rename -s abc -d w5
|
|
commitcloud: rename the 'user/test/abc' workspace to 'user/test/w5' for the repo 'server'
|
|
abort: unknown workspace: user/test/abc
|
|
[255]
|
|
|
|
Try to rename a workspace after leave
|
|
$ hg cloud leave
|
|
commitcloud: this repository is now disconnected from the 'user/test/testhost' workspace
|
|
$ hg cloud rename -d w5
|
|
abort: the repo is not connected to any workspace, please provide the source workspace
|
|
[255]
|
|
$ hg cloud join -w testhost
|
|
commitcloud: this repository is now connected to the 'user/test/testhost' workspace for the 'server' repo
|
|
commitcloud: synchronizing 'server' with 'user/test/testhost'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
Test reclaim workspace
|
|
$ hg cloud reclaim
|
|
abort: please, provide '--user' option, can not identify the former username from the current workspace
|
|
[255]
|
|
|
|
$ hg cloud reclaim --user test
|
|
commitcloud: nothing to reclaim: triggered for the same username
|
|
[1]
|
|
|
|
$ unset HGUSER
|
|
$ setconfig ui.username='Jane Doe <jdoe@example.com>'
|
|
|
|
$ hg smartlog -T '{desc}\n'
|
|
o B (W2)
|
|
│
|
|
o A (W2)
|
|
│
|
|
@ base
|
|
|
|
note: background backup is currently disabled so your commits are not being backed up.
|
|
hint[commitcloud-username-migration]: username configuration has been changed
|
|
please, run `hg cloud reclaim` to migrate your commit cloud workspaces
|
|
hint[hint-ack]: use 'hg hint --ack commitcloud-username-migration' to silence these hints
|
|
|
|
$ hg cloud reclaim
|
|
commitcloud: the following active workspaces are reclaim candidates:
|
|
default
|
|
w3
|
|
testhost
|
|
commitcloud: reclaim of active workspaces completed
|
|
|
|
$ hg cloud list
|
|
commitcloud: searching workspaces for the 'server' repo
|
|
the following commitcloud workspaces are available:
|
|
default
|
|
w3
|
|
testhost (connected)
|
|
run `hg cloud sl -w <workspace name>` to view the commits
|
|
run `hg cloud switch -w <workspace name>` to switch to a different workspace
|
|
|
|
$ hg cloud status
|
|
Workspace: testhost
|
|
Raw Workspace Name: user/jdoe@example.com/testhost
|
|
Automatic Sync (on local changes): OFF
|
|
Automatic Sync via 'Scm Daemon' (on remote changes): OFF
|
|
Last Sync Version: 1
|
|
Last Sync Heads: 1 (0 omitted)
|
|
Last Sync Bookmarks: 0 (0 omitted)
|
|
Last Sync Remote Bookmarks: 1
|
|
Last Sync Time: * (glob)
|
|
Last Sync Status: Success
|
|
|
|
Check that sync is ok after the reclaim
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/jdoe@example.com/testhost'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
Reclaim again
|
|
$ setconfig ui.username='Jane Doe <janedoe@example.com>'
|
|
$ hg cloud reclaim --user 'jdoe@example.com'
|
|
commitcloud: the following active workspaces are reclaim candidates:
|
|
default
|
|
w3
|
|
testhost
|
|
commitcloud: reclaim of active workspaces completed
|
|
|
|
$ hg cloud delete -w w3
|
|
commitcloud: workspace user/janedoe@example.com/w3 has been deleted
|
|
$ hg cloud delete -w testhost
|
|
commitcloud: workspace user/janedoe@example.com/testhost has been deleted
|
|
|
|
$ setconfig ui.username='Jane Doe <jdoe@example.com>'
|
|
$ hg cloud reclaim
|
|
commitcloud: the following active workspaces are reclaim candidates:
|
|
default
|
|
commitcloud: reclaim of active workspaces completed
|
|
commitcloud: the following archived workspaces are reclaim candidates:
|
|
w3
|
|
testhost
|
|
commitcloud: reclaim of archived workspaces completed
|
|
|
|
Try to reclaim after cloud leave
|
|
$ hg cloud leave
|
|
commitcloud: this repository is now disconnected from the 'user/jdoe@example.com/testhost' workspace
|
|
$ setconfig ui.username='Jane Doe <janedoe@example.com>'
|
|
$ hg cloud reclaim
|
|
abort: please, provide '--user' option, can not identify the former username from the current workspace
|
|
[255]
|
|
|
|
$ hg cloud join
|
|
commitcloud: this repository is now connected to the 'user/janedoe@example.com/default' workspace for the 'server' repo
|
|
commitcloud: synchronizing 'server' with 'user/janedoe@example.com/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|