( )⚙ D475 infinitepush: improve revset for not-backed-up revisions

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D475

infinitepush: improve revset for not-backed-up revisions
ClosedPublic

Authored by mbthomas on Aug 22 2017, 10:03 AM.
Tags
None
Subscribers
quark

Details

Reviewers
stash
Group Reviewers
Restricted Project
Commits
rFBHGXad039441c817: infinitepush: improve revset for not-backed-up revisions
Summary

The first version of infinitepush smartlog summary included some false
positives (in particular, not-backed-up but obsolete revs), and took a long
time to compute the set if there were many heads in the repo.

Improve the revset that is used by taking into account the heads that *should*
be backed up. Ancestors of these heads, that are not ancestors of the actual
backup heads are the ones that should be considered "not backed up".

Test Plan

Re-run unit tests.
Manual test on devvm.
Perf test against stash's repo which has more heads than mine.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Aug 22 2017, 10:03 AM
stash accepted this revision.Aug 22 2017, 11:56 AM
This revision is now accepted and ready to land.Aug 22 2017, 11:56 AM
quark added a subscriber: quark.Aug 22 2017, 8:56 PM
quark added inline comments.
infinitepush/backupcommands.py
327

Should we have and not obsolete() here?

Closed by commit rFBHGXad039441c817: infinitepush: improve revset for not-backed-up revisions (authored by mbthomas). · Explain WhyAug 22 2017, 10:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Minfinitepush/backupcommands.py (39 lines)

Diff 1168

infinitepush/backupcommands.py

@revsetpredicate('backedup') @revsetpredicate('backedup')
def backedup(repo, subset, x): def backedup(repo, subset, x):
"""Draft changesets that have been backed up by infinitepush""" """Draft changesets that have been backed up by infinitepush"""
bkpstate = _readlocalbackupstate(repo.ui, repo) bkpstate = _readlocalbackupstate(repo.ui, repo)
visiblebkpheads = [head for head in bkpstate.heads if head in repo] visiblebkpheads = [head for head in bkpstate.heads if head in repo]
return subset & repo.revs('draft() and ::%ls', visiblebkpheads) return subset & repo.revs('draft() and ::%ls', visiblebkpheads)
@revsetpredicate('notbackedup')
def notbackedup(repo, subset, x):
"""Changesets that have not yet been backed up by infinitepush"""
bkpstate = _readlocalbackupstate(repo.ui, repo)
visiblebkpheads = [head for head in bkpstate.heads if head in repo]
expectedbkpheads = _backupheads(repo.ui, repo)
return subset & repo.revs('draft() and only(%ls, %ls)',
quarkUnsubmitted
Not Done

Should we have and not obsolete() here?

quark: Should we have `and not obsolete()` here?
expectedbkpheads, visiblebkpheads)
def smartlogsummary(ui, repo): def smartlogsummary(ui, repo):
if not ui.configbool('infinitepushbackup', 'enablestatus'): if not ui.configbool('infinitepushbackup', 'enablestatus'):
return return
bkpstate = _readlocalbackupstate(ui, repo) bkpstate = _readlocalbackupstate(ui, repo)
visiblebkpheads = [head for head in bkpstate.heads if head in repo] visiblebkpheads = [head for head in bkpstate.heads if head in repo]
unbackeduprevs = repo.revs('draft() and not ::%ls', visiblebkpheads) expectedbkpheads = _backupheads(ui, repo)
unbackeduprevs = repo.revs('draft() and only(%ls, %ls)',
expectedbkpheads, visiblebkpheads)
# Count the number of changesets that haven't been backed up for 10 minutes. # Count the number of changesets that haven't been backed up for 10 minutes.
# If there is only one, also print out its hash. # If there is only one, also print out its hash.
backuptime = time.time() - 10 * 60 # 10 minutes ago backuptime = time.time() - 10 * 60 # 10 minutes ago
count = 0 count = 0
singleunbackeduprev = None singleunbackeduprev = None
for rev in unbackeduprevs: for rev in unbackeduprevs:
if repo[rev].date()[0] <= backuptime: if repo[rev].date()[0] <= backuptime:
singleunbackeduprev = rev singleunbackeduprev = rev
count += 1 count += 1
if count > 0: if count > 0:
if count > 1: if count > 1:
ui.warn(_('note: %d changesets are not backed up.\n') % count) ui.warn(_('note: %d changesets are not backed up.\n') % count)
else: else:
ui.warn(_('note: changeset %s is not backed up.\n') % ui.warn(_('note: changeset %s is not backed up.\n') %
short(repo[singleunbackeduprev].node())) short(repo[singleunbackeduprev].node()))
ui.warn(_('Run `hg pushbackup` to perform a backup. If this fails,\n' ui.warn(_('Run `hg pushbackup` to perform a backup. If this fails,\n'
'please report to the Source Control @ FB group.\n')) 'please report to the Source Control @ FB group.\n'))
def _backupheads(ui, repo):
"""Returns the set of heads that should be backed up in this repo."""
maxheadstobackup = ui.configint('infinitepushbackup',
'maxheadstobackup', -1)
revset = 'head() & draft() & not obsolete()'
backupheads = [ctx.hex() for ctx in repo.set(revset)]
if maxheadstobackup > 0:
backupheads = backupheads[-maxheadstobackup:]
elif maxheadstobackup == 0:
backupheads = []
return set(backupheads)
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()
# 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)
_writebackupgenerationfile(repo.vfs, newbkpgenerationvalue) _writebackupgenerationfile(repo.vfs, newbkpgenerationvalue)
bkpstate = _readlocalbackupstate(ui, repo) bkpstate = _readlocalbackupstate(ui, repo)
maxheadstobackup = ui.configint('infinitepushbackup',
'maxheadstobackup', -1)
revset = 'head() & draft() & not obsolete()'
# this variable stores the local store info (tip numeric revision and date) # this variable stores the local store info (tip numeric revision and date)
# which we use to quickly tell if our backup is stale # which we use to quickly tell if our backup is stale
afterbackupinfo = _getlocalinfo(repo) afterbackupinfo = _getlocalinfo(repo)
# This variable will store what heads will be saved in backup state file # This variable will store what heads will be saved in backup state file
# if backup finishes successfully # if backup finishes successfully
afterbackupheads = [ctx.hex() for ctx in repo.set(revset)] afterbackupheads = _backupheads(ui, repo)
if maxheadstobackup > 0:
afterbackupheads = afterbackupheads[-maxheadstobackup:]
elif maxheadstobackup == 0:
afterbackupheads = []
afterbackupheads = set(afterbackupheads)
other = _getremote(repo, ui, dest, **opts) other = _getremote(repo, ui, dest, **opts)
outgoing, badhexnodes = _getrevstobackup(repo, ui, other, outgoing, badhexnodes = _getrevstobackup(repo, ui, other,
afterbackupheads - bkpstate.heads) afterbackupheads - bkpstate.heads)
# If remotefilelog extension is enabled then there can be nodes that we # If remotefilelog extension is enabled then there can be nodes that we
# can't backup. In this case let's remove them from afterbackupheads # can't backup. In this case let's remove them from afterbackupheads
afterbackupheads.difference_update(badhexnodes) afterbackupheads.difference_update(badhexnodes)
# As afterbackupheads this variable stores what heads will be saved in # As afterbackupheads this variable stores what heads will be saved in