facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

annotate: use keyword arguments for skiprevs and diffopts

Browse Source 
Summary: This will be safer if upstream API ever changed again.

Test Plan: arc unit

Reviewers: #mercurial, rmcelroy

Reviewed By: rmcelroy

Subscribers: mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D5147881

Signature: t1:5147881:1496326141:c70559ffe2bb43953a1a0584163ca24c3235c5f3
This commit is contained in:
Jun Wu 2017-06-01 08:58:00 -07:00
parent 3c782f672b
commit 767de0233b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hgext3rd/fastannotate/support.py
View File

@ -92,13 +92,15 @@ def _fctxannotate(orig, self, follow=False, linenumber=False, skiprevs=None,
diffopts=None):
if skiprevs:
# skiprevs is not supported yet
return orig(self, follow, linenumber, skiprevs, diffopts)
return orig(self, follow, linenumber, skiprevs=skiprevs,
diffopts=diffopts)
try:
return _doannotate(self, follow, diffopts)
except Exception as ex:
self._repo.ui.debug('fastannotate: falling back to the vanilla '
'annotate: %r\n' % ex)
return orig(self, follow, linenumber, skiprevs, diffopts)
return orig(self, follow, linenumber, skiprevs=skiprevs,
diffopts=diffopts)
def _remotefctxannotate(orig, self, follow=False, linenumber=None,
skiprevs=None, diffopts=None, prefetchskip=None):
@ -106,7 +108,7 @@ def _remotefctxannotate(orig, self, follow=False, linenumber=None,
skipset = None
with context.fctxannotatecontext(self, follow, diffopts) as ac:
skipset = revmap.revmap(ac.revmappath)
return orig(self, follow, linenumber, skiprevs, diffopts,
return orig(self, follow, linenumber, skiprevs=skiprevs, diffopts=diffopts,
prefetchskip=skipset)
def replacehgwebannotate():

3
remotefilelog/remotefilectx.py
View File

@ -388,7 +388,8 @@ class remotefilectx(context.filectx):
if fetch:
self._repo.fileservice.prefetch(fetch)
return super(remotefilectx, self).annotate(follow, linenumber,
skiprevs, diffopts)
skiprevs=skiprevs,
diffopts=diffopts)
# Return empty set so that the hg serve and thg don't stack trace
def children(self):