mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
ad813edcbd
Summary: Now that all our repos are treemanifest, let's enable the extension by default in tests. Once we're certain no one needs it in production we'll also make it the default in core Mercurial. This diff includes a minor fix in treemanifest to be aware of always-enabled extensions. It won't matter until we actually add treemanifest to the list of default enabled extensions, but I caught this while testing things. Reviewed By: ikostia Differential Revision: D15030253 fbshipit-source-id: d8361f915928b6ad90665e6ed330c1df5c8d8d86
173 lines
4.2 KiB
Perl
173 lines
4.2 KiB
Perl
$ setconfig extensions.treemanifest=!
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> amend =
|
|
> directaccess=
|
|
> commitcloud =
|
|
> infinitepush =
|
|
> rebase =
|
|
> remotenames =
|
|
> [ui]
|
|
> ssh = python "$TESTDIR/dummyssh"
|
|
> [experimental]
|
|
> evolution = createmarkers, allowunstable
|
|
> EOF
|
|
$ setconfig remotefilelog.reponame=server
|
|
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg commit -Aqm "$1"
|
|
> }
|
|
|
|
Make a server
|
|
$ hg init server
|
|
$ cd server
|
|
$ cat >> .hg/hgrc << EOF
|
|
> [infinitepush]
|
|
> server = yes
|
|
> indextype = disk
|
|
> storetype = disk
|
|
> reponame = testrepo
|
|
> EOF
|
|
|
|
$ mkcommit "base"
|
|
|
|
$ cd ..
|
|
|
|
Make a secondary server
|
|
$ hg clone ssh://user@dummy/server server1 -q
|
|
$ cd server1
|
|
$ cat >> .hg/hgrc << EOF
|
|
> [infinitepush]
|
|
> server = yes
|
|
> indextype = disk
|
|
> storetype = disk
|
|
> reponame = testrepo
|
|
> EOF
|
|
|
|
$ cd ..
|
|
|
|
Make shared part of client config
|
|
$ cat >> shared.rc << EOF
|
|
> [commitcloud]
|
|
> hostname = testhost
|
|
> servicetype = local
|
|
> servicelocation = $TESTTMP
|
|
> user_token_path = $TESTTMP
|
|
> tls.notoken=True
|
|
> 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 ..
|
|
|
|
Make a commit in the first client, and sync it
|
|
$ cd client1
|
|
$ mkcommit "commit1"
|
|
$ hg cloud sync -q
|
|
|
|
$ cd ..
|
|
|
|
Sync from the second client - the commit should appear
|
|
$ cd client2
|
|
$ hg cloud sync -q
|
|
|
|
$ hg up -q tip
|
|
$ tglog
|
|
@ 1: fa5d62c46fd7 'commit1'
|
|
|
|
|
o 0: d20a80d4def3 'base'
|
|
|
|
|
|
Make a commit in the second client, and sync it
|
|
$ mkcommit "commit2"
|
|
$ hg cloud sync -q
|
|
|
|
$ cd ..
|
|
|
|
Return to the first client and configure a different paths.infinitepush
|
|
It will push its commit to the new server, but will fail to sync
|
|
because it can't access the second commit.
|
|
|
|
$ cd client1
|
|
$ mkcommit "commit3"
|
|
|
|
$ hg cloud sync --config paths.infinitepush=ssh://user@dummy/server1
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
backing up stack rooted at fa5d62c46fd7
|
|
remote: pushing 2 commits:
|
|
remote: fa5d62c46fd7 commit1
|
|
remote: 26d5a99991bd commit3
|
|
pulling 02f6fc2b7154
|
|
pulling from ssh://user@dummy/server1
|
|
abort: unknown revision '02f6fc2b715444d7df09bd859e1d4877f9ef9946'!
|
|
[255]
|
|
|
|
$ cd ..
|
|
|
|
Return to client2. We can still sync using the old server.
|
|
|
|
$ cd client2
|
|
$ mkcommit "commit4"
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
backing up stack rooted at fa5d62c46fd7
|
|
remote: pushing 3 commits:
|
|
remote: fa5d62c46fd7 commit1
|
|
remote: 02f6fc2b7154 commit2
|
|
remote: c701070be855 commit4
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
Configure the new server on this client. It will now send all of its commits.
|
|
$ hg cloud sync --config paths.infinitepush=ssh://user@dummy/server1
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
backing up stack rooted at fa5d62c46fd7
|
|
remote: pushing 3 commits:
|
|
remote: fa5d62c46fd7 commit1
|
|
remote: 02f6fc2b7154 commit2
|
|
remote: c701070be855 commit4
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
$ cd ..
|
|
|
|
The first client can now successfully sync using the new server.
|
|
$ cd client1
|
|
$ hg cloud sync --config paths.infinitepush=ssh://user@dummy/server1
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
pulling c701070be855
|
|
pulling from ssh://user@dummy/server1
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 2 changes to 3 files (+1 heads)
|
|
new changesets 02f6fc2b7154:c701070be855
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|
|
Switching back to the previous server still works, and the missing commits
|
|
are backed up there.
|
|
$ hg cloud sync
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
backing up stack rooted at fa5d62c46fd7
|
|
remote: pushing 2 commits:
|
|
remote: fa5d62c46fd7 commit1
|
|
remote: 26d5a99991bd commit3
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
|