mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +03:00
81d738646f
Summary: Merge the functionality of the infinitepushbackup extension (backing up commits to commit cloud) into the commitcloud extension. These two extensions are highly coupled, and the commitcloud extension monkey-patches the infinitepushbackup extension for a lot of its functionality. There is also a lot of code duplication between the two extensions which we can remove if they are part of the same extension. The infinitepushbackup commands (`hg pushbackup`, ...) are moved to subcommands of the `hg cloud` command, e.g. `hg cloud backup`. Each feature of the infinitepushbackup extension is moved to a new module in the commit cloud extension: The `background` module controls background execution of `hg cloud backup` and `hg cloud sync`. The `backupbookmarks` module tracks and updates scratch bookmarks for backups. This will be deprecated in the future. The `backupstate` module tracks whether or not a commit has been backed up. This is now tracked separately from backup bookmarks in a new file: `.hg/commitcloud/backedupheads.<remote-identifier>`. This also covers hidden commits, preventing a re-backup of previously backed up commits when they are unhidden. Previously the commitcloud extension customized the smartlog annotations: `Backing up` became `Syncing`, etc. This is now removed for consistency. Previously the infinitepushbackup extension disabled background backup by injecting an `infinitepushbackup.disableduntil` config entry into the user's config. This is now replaced with a state file at `.hg/commitcloud/autobackup`. Either option can be set to disable auto backup. Commit cloud will wait until both have expired before starting to run background backups again. Reviewed By: DurhamG Differential Revision: D15276939 fbshipit-source-id: 1d28989a157286e47d3dd97ca9c70b27f692dda1
113 lines
2.8 KiB
Perl
113 lines
2.8 KiB
Perl
Remotenames extension has a shortcut that makes heads discovery work faster.
|
|
Unfortunately that may result in sending public commits to the server. This
|
|
test covers the issue.
|
|
|
|
$ . $TESTDIR/library.sh
|
|
$ . $TESTDIR/infinitepush/library.sh
|
|
|
|
$ setupcommon
|
|
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -m "$1"
|
|
> }
|
|
$ scratchnodes() {
|
|
> for node in `find ../repo/.hg/scratchbranches/index/nodemap/* | sort`; do
|
|
> echo ${node##*/}
|
|
> done
|
|
> }
|
|
$ scratchbookmarks() {
|
|
> for bookmark in `find ../repo/.hg/scratchbranches/index/bookmarkmap/* -type f | sort`; do
|
|
> echo "${bookmark##*/bookmarkmap/} `cat $bookmark`"
|
|
> done
|
|
> }
|
|
|
|
Setup server with a few commits and one remote bookmark. This remotebookmark
|
|
may be used by remotenames extension in fastheaddiscovery heuristic
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ setupserver
|
|
$ mkcommit first
|
|
$ hg book remotebook
|
|
$ hg up -q .
|
|
$ mkcommit second
|
|
$ mkcommit third
|
|
$ mkcommit fourth
|
|
$ cd ..
|
|
|
|
Create new client
|
|
$ hg clone ssh://user@dummy/repo --config extensions.remotenames= client -q
|
|
$ cd client
|
|
$ enable remotenames
|
|
|
|
Create scratch commit and back it up.
|
|
$ hg up -q -r 'desc(third)'
|
|
$ mkcommit scratch
|
|
$ hg log -r . -T '{node}\n'
|
|
ce87a066ebc28045311cd1272f5edc0ed80d5b1c
|
|
$ hg log --graph -T '{desc}'
|
|
@ scratch
|
|
|
|
|
| o fourth
|
|
|/
|
|
o third
|
|
|
|
|
o second
|
|
|
|
|
o first
|
|
|
|
$ hg cloud backup
|
|
backing up stack rooted at ce87a066ebc2
|
|
remote: pushing 1 commit:
|
|
remote: ce87a066ebc2 scratch
|
|
commitcloud: backed up 1 commit
|
|
$ cd ..
|
|
|
|
Create second client
|
|
$ hg clone ssh://user@dummy/repo --config extensions.remotenames= client2 -q
|
|
$ cd client2
|
|
$ enable remotenames
|
|
|
|
Pull to get remote names
|
|
$ hg pull
|
|
pulling from ssh://user@dummy/repo
|
|
searching for changes
|
|
no changes found
|
|
$ hg book --remote
|
|
default/remotebook 0:b75a450e74d5
|
|
|
|
Strip public commits from the repo, otherwise fastheaddiscovery heuristic will
|
|
be skipped
|
|
$ hg debugstrip -q -r '1:'
|
|
$ hg log --graph -T '{desc}'
|
|
@ first
|
|
|
|
Download scratch commit. It also downloads a few public commits
|
|
$ hg up -q ce87a066ebc28045311cd1272f5edc0ed80d5b1c
|
|
'ce87a066ebc28045311cd1272f5edc0ed80d5b1c' does not exist locally - looking for it remotely...
|
|
'ce87a066ebc28045311cd1272f5edc0ed80d5b1c' found remotely
|
|
pull finished in * sec (glob)
|
|
$ hg log --graph -T '{desc}'
|
|
@ scratch
|
|
|
|
|
o third
|
|
|
|
|
o second
|
|
|
|
|
o first
|
|
|
|
$ hg book --remote
|
|
default/remotebook 0:b75a450e74d5
|
|
|
|
Run cloud backup and make sure only scratch commits are backed up.
|
|
$ hg cloud backup
|
|
nothing to back up
|
|
$ mkcommit scratch2
|
|
$ hg cloud backup
|
|
backing up stack rooted at ce87a066ebc2
|
|
remote: pushing 2 commits:
|
|
remote: ce87a066ebc2 scratch
|
|
remote: 4dbf2c8dd7d9 scratch2
|
|
commitcloud: backed up 1 commit
|