This is an archive of the discontinued Mercurial Phabricator instance.

Differential D195

infinitepush: remove infinitepush.tempcleanworkingcopiesbackups
ClosedPublic

Authored by stash on Jul 28 2017, 7:30 AM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX217d747f8cc4: infinitepush: remove infinitepush.tempcleanworkingcopiesbackups
Summary

This option was intended as temporary and it was enabled for long enough time.
Now let's delete it.

Test Plan

Run unit-tests

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Test Errors

Event Timeline

stash created this revision.Jul 28 2017, 7:30 AM
quark accepted this revision.Jul 28 2017, 11:05 AM
This revision is now accepted and ready to land.Jul 28 2017, 11:05 AM
Closed by commit rFBHGX217d747f8cc4: infinitepush: remove infinitepush.tempcleanworkingcopiesbackups (authored by stash). · Explain WhyJul 31 2017, 1:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 435

infinitepush/backupcommands.py

# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
""" """
[infinitepushbackup] [infinitepushbackup]
# path to the directory where pushback logs should be stored # path to the directory where pushback logs should be stored
logdir = path/to/dir logdir = path/to/dir
# Backup at most maxheadstobackup heads, other heads are ignored. # Backup at most maxheadstobackup heads, other heads are ignored.
# Negative number means backup everything. # Negative number means backup everything.
maxheadstobackup = -1 maxheadstobackup = -1
# Previously there was a bug in infinitepush backup and it made separate
# backup for the same repo if pushbackup was called from different working
# copies. This option cleans up the mess
tempcleanworkingcopiesbackups = False
# Nodes that should not be backed up. Ancestors of these nodes won't be # Nodes that should not be backed up. Ancestors of these nodes won't be
# backed up either # backed up either
dontbackupnodes = [] dontbackupnodes = []
# Special option that may be used to trigger re-backuping. For example, # Special option that may be used to trigger re-backuping. For example,
# if there was a bug in infinitepush backups, then changing the value of # if there was a bug in infinitepush backups, then changing the value of
# this option will force all clients to make a "clean" backup # this option will force all clients to make a "clean" backup
backupgeneration = 0 backupgeneration = 0
for r in scmutil.revrange(unfi, revs): for r in scmutil.revrange(unfi, revs):
ui.write(_(unfi[r].hex() + ' ')) ui.write(_(unfi[r].hex() + ' '))
ui.write(_('backed up' if r in backeduprevs else 'not backed up')) ui.write(_('backed up' if r in backeduprevs else 'not backed up'))
ui.write(_('\n')) ui.write(_('\n'))
def _dobackup(ui, repo, dest, **opts): def _dobackup(ui, repo, dest, **opts):
ui.status(_('starting backup %s\n') % time.strftime('%H:%M:%S %d %b %Y %Z')) ui.status(_('starting backup %s\n') % time.strftime('%H:%M:%S %d %b %Y %Z'))
start = time.time() start = time.time()
maybesharedrepo = repo
# to handle multiple working copies correctly # to handle multiple working copies correctly
repo = _getsrcrepo(repo) repo = _getsrcrepo(repo)
currentbkpgenerationvalue = _readbackupgenerationfile(repo.vfs) currentbkpgenerationvalue = _readbackupgenerationfile(repo.vfs)
newbkpgenerationvalue = ui.configint('infinitepushbackup', newbkpgenerationvalue = ui.configint('infinitepushbackup',
'backupgeneration', 0) 'backupgeneration', 0)
if currentbkpgenerationvalue != newbkpgenerationvalue: if currentbkpgenerationvalue != newbkpgenerationvalue:
# Unlinking local backup state will trigger re-backuping # Unlinking local backup state will trigger re-backuping
_deletebackupstate(repo) _deletebackupstate(repo)
newbookmarks = _dictdiff(afterbackuplocalbooks, bkpstate.localbookmarks) newbookmarks = _dictdiff(afterbackuplocalbooks, bkpstate.localbookmarks)
removedbookmarks = _dictdiff(bkpstate.localbookmarks, afterbackuplocalbooks) removedbookmarks = _dictdiff(bkpstate.localbookmarks, afterbackuplocalbooks)
namingmgr = BackupBookmarkNamingManager(ui, repo) namingmgr = BackupBookmarkNamingManager(ui, repo)
bookmarkstobackup = _getbookmarkstobackup( bookmarkstobackup = _getbookmarkstobackup(
repo, newbookmarks, removedbookmarks, repo, newbookmarks, removedbookmarks,
newheads, removedheads, namingmgr) newheads, removedheads, namingmgr)
if maybesharedrepo.origroot != repo.origroot:
if (ui.config('infinitepushbackup', 'tempcleanworkingcopiesbackups') and
_localbackupstateexists(maybesharedrepo)):
# Previously there was a bug in infinitepush backup and it
# made multiple backups for the same repo if pushbackup was called
# from different working copies. Let's delete bookmarks for the
# same working copy
sharedreponamingmgr = BackupBookmarkNamingManager(
ui, maybesharedrepo)
bookmarkprefixtodelete = sharedreponamingmgr.getcommonprefix()
bookmarkstobackup[bookmarkprefixtodelete] = ''
_deletebackupstate(maybesharedrepo)
# Special case if backup state is empty. Clean all backup bookmarks from the # Special case if backup state is empty. Clean all backup bookmarks from the
# server. # server.
if bkpstate.empty(): if bkpstate.empty():
bookmarkstobackup[namingmgr.getbackupheadprefix()] = '' bookmarkstobackup[namingmgr.getbackupheadprefix()] = ''
bookmarkstobackup[namingmgr.getbackupbookmarkprefix()] = '' bookmarkstobackup[namingmgr.getbackupbookmarkprefix()] = ''
# Wrap deltaparent function to make sure that bundle takes less space # Wrap deltaparent function to make sure that bundle takes less space
# See _deltaparent comments for details # See _deltaparent comments for details

tests/test-infinitepush-backup-share.t

finished in \d+\.(\d+)? seconds (re) finished in \d+\.(\d+)? seconds (re)
$ scratchbookmarks $ scratchbookmarks
infinitepush/backups/test/*$TESTTMP/client/heads/b75a450e74d5a7708da8c3144fbeb4ac88694044 b75a450e74d5a7708da8c3144fbeb4ac88694044 (glob) infinitepush/backups/test/*$TESTTMP/client/heads/b75a450e74d5a7708da8c3144fbeb4ac88694044 b75a450e74d5a7708da8c3144fbeb4ac88694044 (glob)
Make sure that backup state is saved only on the "main" repo Make sure that backup state is saved only on the "main" repo
$ cat .hg/infinitepushbackupstate $ cat .hg/infinitepushbackupstate
rubbish rubbish
$ [ -f ../client/.hg/infinitepushbackupstate ] $ [ -f ../client/.hg/infinitepushbackupstate ]
Test hacky infinitepushbackup.tempcleanworkingcopiesbackups config option that
cleans up unnecessary backup bookmarks from the server.
If this option is set and backup state file is present in shared working copy
then there are probably useless backup bookmarks on the server.
In that case `hg pushbackup` will send commands to clean them. And because of it
there should be no 'nothing to backup' line in the output.
$ hg --config infinitepushbackup.tempcleanworkingcopiesbackups=True pushbackup
starting backup .* (re)
finished in \d+\.(\d+)? seconds (re)
Make sure that backup state file is deleted from shared working copy
$ [ -f .hg/infinitepushbackupstate ]
[1]
Now backup state file is deleted, so there should be line `nothing to backup`.
$ hg --config infinitepushbackup.tempcleanworkingcopiesbackups=True pushbackup
starting backup .* (re)
nothing to backup
finished in \d+\.(\d+)? seconds (re)
Make sure nothing important was deleted
$ [ -f ../client/.hg/infinitepushbackupstate ]
$ scratchbookmarks
infinitepush/backups/test/*$TESTTMP/client/heads/b75a450e74d5a7708da8c3144fbeb4ac88694044 b75a450e74d5a7708da8c3144fbeb4ac88694044 (glob)