mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
9bd3235f3f
Summary: The both options have basically the same value. This is my next step for resolving mismatches between CC dynamic config and the current configuration and generally improving CC configuration. Reviewed By: DurhamG Differential Revision: D25973556 fbshipit-source-id: aae21efcd5174ed58efcb9e5d8c85831d35777ea
188 lines
5.0 KiB
Perl
188 lines
5.0 KiB
Perl
#chg-compatible
|
|
|
|
$ configure dummyssh mutation-norecord
|
|
$ disable treemanifest
|
|
$ enable amend commitcloud infinitepush rebase remotenames share
|
|
$ setconfig infinitepush.branchpattern="re:scratch/.*" commitcloud.hostname=testhost
|
|
$ readconfig <<EOF
|
|
> [alias]
|
|
> trglog = log -G --template "{node|short} '{desc}' {bookmarks} {remotenames}\n"
|
|
> descr = log -r '.' --template "{desc}"
|
|
> EOF
|
|
|
|
$ setconfig remotefilelog.reponame=server
|
|
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg commit -Aqm "$1"
|
|
> }
|
|
|
|
$ hg init server
|
|
$ cd server
|
|
$ cat >> .hg/hgrc << EOF
|
|
> [infinitepush]
|
|
> server = yes
|
|
> indextype = disk
|
|
> storetype = disk
|
|
> reponame = testrepo
|
|
> EOF
|
|
|
|
$ mkcommit "base"
|
|
$ hg bookmark master
|
|
$ cd ..
|
|
|
|
Make shared part of config
|
|
$ cat >> shared.rc << EOF
|
|
> [commitcloud]
|
|
> servicetype = local
|
|
> servicelocation = $TESTTMP
|
|
> token_enforced = False
|
|
> EOF
|
|
|
|
Make the first clone of the server
|
|
$ hg clone ssh://user@dummy/server client1 -q
|
|
$ cd client1
|
|
$ cat ../shared.rc >> .hg/hgrc
|
|
$ hg cloud join -q
|
|
|
|
$ cd ..
|
|
|
|
Make the second clone of the server
|
|
$ hg clone ssh://user@dummy/server client2 -q
|
|
$ cd client2
|
|
$ cat ../shared.rc >> .hg/hgrc
|
|
$ hg cloud join -q
|
|
|
|
$ cd ..
|
|
|
|
Test for `hg unamend`
|
|
|
|
Make a commit in the first client, and sync it
|
|
$ cd client1
|
|
$ mkcommit "feature1"
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
backing up stack rooted at 1cf4a5a0e8fc
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
remote: pushing 1 commit:
|
|
remote: 1cf4a5a0e8fc feature1
|
|
|
|
$ hg amend -m "feature1 renamed"
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
backing up stack rooted at b68dd726c6c6
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
remote: pushing 1 commit:
|
|
remote: b68dd726c6c6 feature1 renamed
|
|
|
|
$ cd ..
|
|
|
|
Sync from the second client and `hg unamend` there
|
|
$ cd client2
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
pulling b68dd726c6c6 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)
|
|
|
|
$ tglog
|
|
o b68dd726c6c6 'feature1 renamed'
|
|
│
|
|
@ d20a80d4def3 'base'
|
|
|
|
|
|
$ hg up b68dd726c6c6
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
$ hg unamend
|
|
pulling '1cf4a5a0e8fc41ef1289e833ebdb22d754c080ac' from 'ssh://user@dummy/server'
|
|
|
|
$ tglog
|
|
@ 1cf4a5a0e8fc 'feature1'
|
|
│
|
|
o d20a80d4def3 'base'
|
|
|
|
|
|
(with mutation and visibility, it's not possible to undo the relationship of
|
|
amend, therefore the "has been replaced" message)
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
$ cd ..
|
|
|
|
$ cd client1
|
|
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ tglog
|
|
@ b68dd726c6c6 'feature1 renamed'
|
|
│
|
|
│ x 1cf4a5a0e8fc 'feature1'
|
|
├─╯
|
|
o d20a80d4def3 'base'
|
|
|
|
Amend twice, unamend, then unhide
|
|
$ hg up -q 1cf4a5a0e8fc
|
|
$ hg amend -m "feature1 renamed2"
|
|
$ hg amend -m "feature1 renamed3"
|
|
$ hg unamend
|
|
$ hg unhide 74b668b6b779
|
|
$ tglog
|
|
o 74b668b6b779 'feature1 renamed3'
|
|
│
|
|
│ @ cb45bbd0ae75 'feature1 renamed2'
|
|
├─╯
|
|
o d20a80d4def3 'base'
|
|
|
|
$ P=1 hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
backing up stack rooted at cb45bbd0ae75
|
|
backing up stack rooted at 74b668b6b779
|
|
commitcloud: commits synchronized
|
|
finished in * sec (glob)
|
|
commitcloud: current revision cb45bbd0ae75 has been moved remotely to 74b668b6b779
|
|
hint[commitcloud-update-on-move]: if you would like to update to the moved version automatically add
|
|
[commitcloud]
|
|
updateonmove = true
|
|
to your .hgrc config file
|
|
hint[hint-ack]: use 'hg hint --ack commitcloud-update-on-move' to silence these hints
|
|
remote: pushing 1 commit:
|
|
remote: cb45bbd0ae75 feature1 renamed2
|
|
remote: pushing 1 commit:
|
|
remote: 74b668b6b779 feature1 renamed3
|
|
|
|
Now cloud sync in the other client. The cycle means we can't reliably pick a destination.
|
|
$ cd ../client2
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
pulling cb45bbd0ae75 74b668b6b779 from ssh://user@dummy/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 1 files
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 1 files
|
|
commitcloud: commits synchronized
|
|
finished in * sec (glob)
|
|
commitcloud: current revision 1cf4a5a0e8fc has been moved remotely to 74b668b6b779
|
|
hint[commitcloud-update-on-move]: if you would like to update to the moved version automatically add
|
|
[commitcloud]
|
|
updateonmove = true
|
|
to your .hgrc config file
|
|
hint[hint-ack]: use 'hg hint --ack commitcloud-update-on-move' to silence these hints
|