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
62 lines
1.8 KiB
Perl
62 lines
1.8 KiB
Perl
$ enable amend
|
|
$ setconfig infinitepushbackup.hostname=testhost
|
|
|
|
$ . "$TESTDIR/library.sh"
|
|
$ . "$TESTDIR/infinitepush/library.sh"
|
|
$ setupcommon
|
|
|
|
Setup server
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ setupserver
|
|
$ cd ..
|
|
|
|
Setup backupsource
|
|
$ hg clone ssh://user@dummy/repo backupsource -q
|
|
$ cd backupsource
|
|
|
|
Do a normal backup
|
|
$ mkcommit first
|
|
$ hg cloud backup
|
|
backing up stack rooted at b75a450e74d5
|
|
remote: pushing 1 commit:
|
|
remote: b75a450e74d5 first
|
|
commitcloud: backed up 1 commit
|
|
|
|
Make a commit, than prune a commit, than create a bookmark on top of it.
|
|
Do a backup and try to restore. Make sure it doesn't fail
|
|
$ hg up -q null
|
|
$ mkcommit tobepruned
|
|
$ hg log -r . -T '{node}\n'
|
|
edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff
|
|
$ hg prune .
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
working directory now at 000000000000
|
|
1 changesets pruned
|
|
hint[strip-hide]: 'hg strip' may be deprecated in the future - use 'hg hide' instead
|
|
hint[hint-ack]: use 'hg hint --ack strip-hide' to silence these hints
|
|
$ hg --hidden book -r edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff newbookonpruned
|
|
$ hg cloud backup
|
|
backing up stack rooted at edb281c9cc7e
|
|
remote: pushing 1 commit:
|
|
remote: edb281c9cc7e tobepruned
|
|
commitcloud: backed up 1 commit
|
|
|
|
Restore the repo
|
|
$ cd ..
|
|
$ hg clone ssh://user@dummy/repo restored -q
|
|
$ cd restored
|
|
$ hg cloud restorebackup
|
|
restoring backup for test from $TESTTMP/backupsource on testhost
|
|
pulling from ssh://user@dummy/repo
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets b75a450e74d5:edb281c9cc7e
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|