This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3972

backups: stop passing partial nodeid to repo.__contains__
ClosedPublic

Authored by martinvonz on Jul 24 2018, 1:43 AM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXe3c256ac10fe: backups: stop passing partial nodeid to repo.__contains__
Summary

repo.contains (and repo.getitem) accepts a more limited set
input types these days.

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

martinvonz created this revision.Jul 24 2018, 1:43 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 24 2018, 1:43 AM
quark accepted this revision.Jul 24 2018, 2:26 AM
This revision is now accepted and ready to land.Jul 24 2018, 2:26 AM
Closed by commit rFBHGXe3c256ac10fe: backups: stop passing partial nodeid to repo.__contains__ (authored by martinvonz). · Explain WhyJul 24 2018, 3:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/backups.py (5 lines)

Diff 9651

hgext3rd/backups.py

To disable that warning, set ``backups.warnobsolescence`` to False. To disable that warning, set ``backups.warnobsolescence`` to False.
""" """
from mercurial import cmdutil, commands, error, bundlerepo from mercurial import cmdutil, commands, error, bundlerepo
from mercurial import hg, exchange, obsolete, registrar from mercurial import hg, exchange, obsolete, registrar
from mercurial import bundle2, registrar from mercurial import bundle2, registrar
from mercurial import lock as lockmod from mercurial import lock as lockmod
from mercurial import pycompat from mercurial import pycompat
from mercurial import scmutil
from mercurial import util from mercurial import util
from hgext import pager from hgext import pager
from mercurial.node import nullid, short from mercurial.node import nullid, short
from mercurial.i18n import _ from mercurial.i18n import _
import os, glob, time import os, glob, time
pager.attended.append('backups') pager.attended.append('backups')
parents = [p for p in other.changelog.parents(n) if p != nullid] parents = [p for p in other.changelog.parents(n) if p != nullid]
if opts.get('no_merges') and len(parents) == 2: if opts.get('no_merges') and len(parents) == 2:
continue continue
count += 1 count += 1
displayer.show(other[n]) displayer.show(other[n])
recovernode = opts.get('recover') recovernode = opts.get('recover')
if recovernode: if recovernode:
if recovernode in repo: if scmutil.isrevsymbol(repo, recovernode):
ui.warn(_("%s already exists in the repo\n") % recovernode) ui.warn(_("%s already exists in the repo\n") % recovernode)
return return
else: else:
msg = _('Recover changesets using: hg backups --recover ' msg = _('Recover changesets using: hg backups --recover '
'<changeset hash>\n\nAvailable backup changesets:') '<changeset hash>\n\nAvailable backup changesets:')
ui.status(msg, label="status.removed") ui.status(msg, label="status.removed")
for backup in backups: for backup in backups:
ui.quiet = quiet ui.quiet = quiet
try: try:
if chlist: if chlist:
if recovernode: if recovernode:
tr = lock = None tr = lock = None
try: try:
lock = repo.lock() lock = repo.lock()
if recovernode in other: if scmutil.isrevsymbol(other, recovernode):
ui.status(_("Unbundling %s\n") % (recovernode)) ui.status(_("Unbundling %s\n") % (recovernode))
f = hg.openpath(ui, source) f = hg.openpath(ui, source)
gen = exchange.readbundle(ui, f, source) gen = exchange.readbundle(ui, f, source)
tr = repo.transaction("unbundle") tr = repo.transaction("unbundle")
if not isinstance(gen, bundle2.unbundle20): if not isinstance(gen, bundle2.unbundle20):
gen.apply(repo, 'unbundle', 'bundle:' + source) gen.apply(repo, 'unbundle', 'bundle:' + source)
if isinstance(gen, bundle2.unbundle20): if isinstance(gen, bundle2.unbundle20):
bundle2.applybundle(repo, gen, tr, bundle2.applybundle(repo, gen, tr,