This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3408

compat: add support for hg >= b235bde3
ClosedPublic

Authored by martinvonz on Apr 18 2018, 6:00 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXd3937fd12b9a: compat: add support for hg >= b235bde3
Summary

Commit b235bde3 dropped the "linenumber" argument from
filectx.annotate(). Since we only ever pass "prefetchskip" by name, we
can safely access it via kwargs.

This patch doesn't update fastannotate in a backwards compatible way
simply because we don't use fastannotate at Google (we do use absorb,
and hopefully that doesn't depend on fastannotate's override?).

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.Apr 18 2018, 6:00 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 18 2018, 6:00 PM
quark accepted this revision.Apr 18 2018, 10:43 PM
This revision is now accepted and ready to land.Apr 18 2018, 10:43 PM
Closed by commit rFBHGXd3937fd12b9a: compat: add support for hg >= b235bde3 (authored by martinvonz). · Explain WhyApr 18 2018, 10:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8402

hgext3rd/fastannotate/support.py

try: try:
return _doannotate(self, follow, diffopts) return _doannotate(self, follow, diffopts)
except Exception as ex: except Exception as ex:
self._repo.ui.debug('fastannotate: falling back to the vanilla ' self._repo.ui.debug('fastannotate: falling back to the vanilla '
'annotate: %r\n' % ex) 'annotate: %r\n' % ex)
return orig(self, follow, linenumber, skiprevs=skiprevs, return orig(self, follow, linenumber, skiprevs=skiprevs,
diffopts=diffopts) diffopts=diffopts)
def _remotefctxannotate(orig, self, follow=False, linenumber=None, def _remotefctxannotate(orig, self, follow=False, skiprevs=None, diffopts=None):
skiprevs=None, diffopts=None):
# skipset: a set-like used to test if a fctx needs to be downloaded # skipset: a set-like used to test if a fctx needs to be downloaded
skipset = None skipset = None
with context.fctxannotatecontext(self, follow, diffopts) as ac: with context.fctxannotatecontext(self, follow, diffopts) as ac:
skipset = revmap.revmap(ac.revmappath) skipset = revmap.revmap(ac.revmappath)
return orig(self, follow, linenumber, skiprevs=skiprevs, diffopts=diffopts, return orig(self, follow, skiprevs=skiprevs, diffopts=diffopts,
prefetchskip=skipset) prefetchskip=skipset)
def replacehgwebannotate(): def replacehgwebannotate():
extensions.wrapfunction(hgweb.webutil, 'annotate', _hgwebannotate) extensions.wrapfunction(hgweb.webutil, 'annotate', _hgwebannotate)
def replacefctxannotate(): def replacefctxannotate():
extensions.wrapfunction(hgcontext.basefilectx, 'annotate', _fctxannotate) extensions.wrapfunction(hgcontext.basefilectx, 'annotate', _fctxannotate)
def replaceremotefctxannotate(): def replaceremotefctxannotate():
try: try:
r = extensions.find('remotefilelog') r = extensions.find('remotefilelog')
except KeyError: except KeyError:
return return
else: else:
extensions.wrapfunction(r.remotefilectx.remotefilectx, 'annotate', extensions.wrapfunction(r.remotefilectx.remotefilectx, 'annotate',
_remotefctxannotate) _remotefctxannotate)

remotefilelog/remotefilectx.py

if result: if result:
f, n = result f, n = result
r = remotefilectx(self._repo, f, fileid=n, r = remotefilectx(self._repo, f, fileid=n,
ancestormap=amap) ancestormap=amap)
return r return r
return None return None
def annotate(self, follow=False, linenumber=None, skiprevs=None, def annotate(self, *args, **kwargs):
diffopts=None, prefetchskip=None):
introctx = self introctx = self
prefetchskip = kwargs.pop('prefetchskip', None)
if prefetchskip: if prefetchskip:
# use introrev so prefetchskip can be accurately tested # use introrev so prefetchskip can be accurately tested
introrev = self.introrev() introrev = self.introrev()
if self.rev() != introrev: if self.rev() != introrev:
introctx = remotefilectx(self._repo, self._path, introctx = remotefilectx(self._repo, self._path,
changeid=introrev, changeid=introrev,
fileid=self._filenode, fileid=self._filenode,
filelog=self._filelog, filelog=self._filelog,
if parent.node() not in seen: if parent.node() not in seen:
seen.add(parent.node()) seen.add(parent.node())
queue.append(parent) queue.append(parent)
self._repo.ui.debug('remotefilelog: prefetching %d files ' self._repo.ui.debug('remotefilelog: prefetching %d files '
'for annotate\n' % len(fetch)) 'for annotate\n' % len(fetch))
if fetch: if fetch:
self._repo.fileservice.prefetch(fetch) self._repo.fileservice.prefetch(fetch)
return super(remotefilectx, self).annotate(follow, linenumber, return super(remotefilectx, self).annotate(*args, **kwargs)
skiprevs=skiprevs,
diffopts=diffopts)
# Return empty set so that the hg serve and thg don't stack trace # Return empty set so that the hg serve and thg don't stack trace
def children(self): def children(self):
return [] return []
class remoteworkingfilectx(context.workingfilectx, remotefilectx): class remoteworkingfilectx(context.workingfilectx, remotefilectx):
def __init__(self, repo, path, filelog=None, workingctx=None): def __init__(self, repo, path, filelog=None, workingctx=None):
self._ancestormap = None self._ancestormap = None