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
87 lines
3.8 KiB
Perl
87 lines
3.8 KiB
Perl
#if no-windows no-osx
|
|
$ . "$TESTDIR/library.sh"
|
|
$ . "$TESTDIR/infinitepush/library.sh"
|
|
$ setupcommon
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -m "$1"
|
|
> }
|
|
$ hg init server
|
|
$ cd server
|
|
$ setupsqlserverhgrc babar
|
|
$ setupdb
|
|
$ cd ..
|
|
$ hg clone -q ssh://user@dummy/server client
|
|
$ cd client
|
|
$ setupsqlclienthgrc
|
|
$ mkcommit initialcommit
|
|
$ hg cloud backup
|
|
backing up stack rooted at 67145f466344
|
|
remote: pushing 1 commit:
|
|
remote: 67145f466344 initialcommit
|
|
commitcloud: backed up 1 commit
|
|
$ mkcommit commitwithbookmark
|
|
$ hg book abook
|
|
$ sleep 1 # Resolution of the database is in seconds. This avoids test flakiness
|
|
$ hg cloud backup
|
|
backing up stack rooted at 67145f466344
|
|
remote: pushing 2 commits:
|
|
remote: 67145f466344 initialcommit
|
|
remote: 5ea4271ca0f0 commitwithbookmark
|
|
commitcloud: backed up 1 commit
|
|
$ mysql -h $DBHOST -P $DBPORT -D $DBNAME -u $DBUSER $DBPASSOPT -e 'SELECT bookmark, node, reponame from bookmarkstonode'
|
|
bookmark node reponame
|
|
infinitepush/backups/test/.*\$TESTTMP/client/bookmarks/abook 5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f babar (re)
|
|
infinitepush/backups/test/.*\$TESTTMP/client/heads/5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f 5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f babar (re)
|
|
|
|
Create a few more commits to test that cloud restorebackup preserves order
|
|
$ hg up -q 0
|
|
$ mkcommit anothercommit > /dev/null
|
|
$ hg cloud backup -q
|
|
$ hg up -q 0
|
|
$ sleep 1 # Resolution of the database is in seconds. This avoids test flakiness
|
|
$ mkcommit anothercommit2 > /dev/null
|
|
$ hg cloud backup -q
|
|
$ hg log -T '{rev}:{node}\n'
|
|
3:e1c1c1f2871f70bd24f941ebfec59f14adf7a13d
|
|
2:f0d24965f49e87fc581a603dee76196f433444ff
|
|
1:5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f
|
|
0:67145f4663446a9580364f70034fea6e21293b6f
|
|
|
|
Pull backup and check that commits are in the same order
|
|
$ cd ..
|
|
$ hg clone -q ssh://user@dummy/server client2
|
|
$ cd client2
|
|
$ hg cloud restore -q
|
|
$ hg log -T '{rev}:{node}\n'
|
|
3:e1c1c1f2871f70bd24f941ebfec59f14adf7a13d
|
|
2:f0d24965f49e87fc581a603dee76196f433444ff
|
|
1:5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f
|
|
0:67145f4663446a9580364f70034fea6e21293b6f
|
|
|
|
Create a server with different name that connects to the same db
|
|
$ cd ..
|
|
$ rm -rf server
|
|
$ hg init server
|
|
$ cd server
|
|
$ setupsqlserverhgrc newserver
|
|
$ echo "sqlhost=$DBHOST:$DBPORT:$DBNAME:$DBUSER:$DBPASS" >> .hg/hgrc
|
|
|
|
Go to client, delete backup state and run pushbackup. Make sure that it doesn't delete entries from another repo
|
|
$ cd ../client
|
|
$ rm -r .hg/infinitepushbackups
|
|
$ hg cloud backup
|
|
nothing to back up
|
|
$ mysql -h $DBHOST -P $DBPORT -D $DBNAME -u $DBUSER $DBPASSOPT -e 'SELECT bookmark, node, reponame from bookmarkstonode'
|
|
bookmark node reponame
|
|
infinitepush/backups/test/.*\$TESTTMP/client/bookmarks/abook 5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f babar (re)
|
|
infinitepush/backups/test/.*\$TESTTMP/client/heads/5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f 5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f babar (re)
|
|
infinitepush/backups/test/.*\$TESTTMP/client/heads/e1c1c1f2871f70bd24f941ebfec59f14adf7a13d e1c1c1f2871f70bd24f941ebfec59f14adf7a13d babar (re)
|
|
infinitepush/backups/test/.*\$TESTTMP/client/heads/f0d24965f49e87fc581a603dee76196f433444ff f0d24965f49e87fc581a603dee76196f433444ff babar (re)
|
|
infinitepush/backups/test/.*\$TESTTMP/client/bookmarks/abook 5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f newserver (re)
|
|
infinitepush/backups/test/.*\$TESTTMP/client/heads/5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f 5ea4271ca0f0cda5477241ae95ffc1fa7056ee6f newserver (re)
|
|
infinitepush/backups/test/.*\$TESTTMP/client/heads/e1c1c1f2871f70bd24f941ebfec59f14adf7a13d e1c1c1f2871f70bd24f941ebfec59f14adf7a13d newserver (re)
|
|
infinitepush/backups/test/.*\$TESTTMP/client/heads/f0d24965f49e87fc581a603dee76196f433444ff f0d24965f49e87fc581a603dee76196f433444ff newserver (re)
|
|
#endif
|