This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1613

infinitepush: consider hidden revisions when computing backedup state
ClosedPublic

Authored by mbthomas on Dec 7 2017, 5:53 AM.
Tags
None
Subscribers
None

Details

Reviewers
stash
Group Reviewers
Restricted Project
Commits
rFBHGXeb10e9f4e867: infinitepush: consider hidden revisions when computing backedup state
Summary

If a backup head is hidden (e.g. by rebase), then all its ancestor commits
appear as not-backed-up, even though they are.

Consider hidden commits as part of determining whether a revset is backed up or
not, and then filter out the hidden changesets afterwards.

Test Plan

Add a new test case.

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.Dec 7 2017, 5:53 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 7 2017, 5:53 AM
stash accepted this revision.Dec 8 2017, 12:02 PM
This revision is now accepted and ready to land.Dec 8 2017, 12:02 PM
Closed by commit rFBHGXeb10e9f4e867: infinitepush: consider hidden revisions when computing backedup state (authored by mbthomas). · Explain WhyDec 15 2017, 2:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 4492

infinitepush/backupcommands.py

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'))
@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"""
unfi = repo.unfiltered()
bkpstate = _readlocalbackupstate(repo.ui, repo) bkpstate = _readlocalbackupstate(repo.ui, repo)
visiblebkpheads = [head for head in bkpstate.heads if head in repo] return subset & unfi.revs('draft() and ::%ls and not hidden()',
return subset & repo.revs('draft() and ::%ls', visiblebkpheads) bkpstate.heads)
@revsetpredicate('notbackedup') @revsetpredicate('notbackedup')
def notbackedup(repo, subset, x): def notbackedup(repo, subset, x):
"""Changesets that have not yet been backed up by infinitepush""" """Changesets that have not yet been backed up by infinitepush"""
bkpstate = _readlocalbackupstate(repo.ui, repo) bkpstate = _readlocalbackupstate(repo.ui, repo)
bkpheads = set(bkpstate.heads) bkpheads = set(bkpstate.heads)
candidates = set(_backupheads(repo.ui, repo)) candidates = set(_backupheads(repo.ui, repo))
notbackeduprevs = set() notbackeduprevs = set()
# Find all revisions that are ancestors of the expected backup heads, # Find all revisions that are ancestors of the expected backup heads,
# stopping when we reach either a public commit or a known backup head. # stopping when we reach either a public commit or a known backup head.
while candidates: while candidates:
candidate = candidates.pop() candidate = candidates.pop()
if candidate not in bkpheads: if candidate not in bkpheads:
ctx = repo[candidate] ctx = repo[candidate]
rev = ctx.rev() rev = ctx.rev()
if rev not in notbackeduprevs and ctx.phase() != phases.public: if rev not in notbackeduprevs and ctx.phase() != phases.public:
# This rev may not have been backed up. Record it, and add its # This rev may not have been backed up. Record it, and add its
# parents as candidates. # parents as candidates.
notbackeduprevs.add(rev) notbackeduprevs.add(rev)
candidates.update([p.hex() for p in ctx.parents()]) candidates.update([p.hex() for p in ctx.parents()])
if notbackeduprevs: if notbackeduprevs:
# Some revisions in this set may actually have been backed up by # Some revisions in this set may actually have been backed up by
# virtue of being an ancestor of a different backup head. Find these # virtue of being an ancestor of a different backup head, which may
# and remove them from the set. # have been hidden since the backup was made. Find these and remove
# them from the set.
unfi = repo.unfiltered()
candidates = bkpheads candidates = bkpheads
while candidates: while candidates:
candidate = candidates.pop() candidate = candidates.pop()
if candidate in repo: if candidate in unfi:
ctx = repo[candidate] ctx = unfi[candidate]
if ctx.phase() != phases.public: if ctx.phase() != phases.public:
notbackeduprevs.discard(ctx.rev()) notbackeduprevs.discard(ctx.rev())
candidates.update([p.hex() for p in ctx.parents()]) candidates.update([p.hex() for p in ctx.parents()])
return subset & notbackeduprevs return subset & notbackeduprevs
def smartlogsummary(ui, repo): def smartlogsummary(ui, repo):
if not ui.configbool('infinitepushbackup', 'enablestatus'): if not ui.configbool('infinitepushbackup', 'enablestatus'):
return return

tests/test-infinitepush-backup-status.t

$ setup() { $ setup() {
> cat << EOF >> .hg/hgrc > cat << EOF >> .hg/hgrc
> [extensions] > [extensions]
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
> smartlog=$TESTDIR/../hgext3rd/smartlog.py > smartlog=$TESTDIR/../hgext3rd/smartlog.py
> [infinitepushbackup] > [infinitepushbackup]
> enablestatus = True > enablestatus = True
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> EOF > EOF
> } > }
$ . "$TESTDIR/library.sh" $ . "$TESTDIR/library.sh"
$ hg commit -d "$commit_time 0" -m "Backed up changeset 2" $ hg commit -d "$commit_time 0" -m "Backed up changeset 2"
$ hg pushbackup $ hg pushbackup
starting backup .* (re) starting backup .* (re)
searching for changes searching for changes
remote: pushing 2 commits: remote: pushing 2 commits:
remote: * Backed up changeset (glob) remote: * Backed up changeset (glob)
remote: * Backed up changeset 2 (glob) remote: * Backed up changeset 2 (glob)
finished in \d+\.(\d+)? seconds (re) finished in \d+\.(\d+)? seconds (re)
Check hiding the backup head doesn't affect backed-up changesets
$ hg up -q 2
$ hg log -T '{rev} {desc}\n' -r 'backedup()'
2 Backed up changeset
3 Backed up changeset 2
$ hg log -T '{rev} {desc}\n' -r 'notbackedup()'
$ hg hide 3
1 changesets hidden
$ hg log -T '{rev} {desc}\n' -r 'backedup()'
2 Backed up changeset
$ hg log -T '{rev} {desc}\n' -r 'notbackedup()'
$ hg unhide 3
$ hg up -q 3
Create some changesets that aren't backed up
$ echo b > file1 $ echo b > file1
$ commit_time=`expr $now - 11 \* 60` $ commit_time=`expr $now - 11 \* 60`
$ hg commit -d "$commit_time 0" -m "Not backed up changeset" $ hg commit -d "$commit_time 0" -m "Not backed up changeset"
$ echo c > file1 $ echo c > file1
$ commit_time=`expr $now - 9 \* 60` $ commit_time=`expr $now - 9 \* 60`
$ hg commit -d "$commit_time 0" -m "Backup pending changeset" $ hg commit -d "$commit_time 0" -m "Backup pending changeset"
Check backup status of commits Check backup status of commits