( )⚙ D2918 rebase: inline _makextrafn() now that we have only one caller

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2918

rebase: inline _makextrafn() now that we have only one caller
ClosedPublic

Authored by martinvonz on Mar 21 2018, 2:10 PM.

Details

Reviewers
phillco
indygreg
Group Reviewers
hg-reviewers
Commits
rHGbd0086bd3af4: rebase: inline _makextrafn() now that we have only one caller
Summary

Also avoid even creating a function since we just end up calling it
right away.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 21 2018, 2:10 PM
indygreg accepted this revision.Mar 21 2018, 7:40 PM
indygreg added a subscriber: indygreg.

The ability to register extra functions seems like the important functionality here. And self.extrafns is preserved. So I don't think anyone will miss the old function.

This revision is now accepted and ready to land.Mar 21 2018, 7:40 PM
Closed by commit rHGbd0086bd3af4: rebase: inline _makextrafn() now that we have only one caller (authored by martinvonz). · Explain WhyMar 21 2018, 7:44 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (16 lines)

Diff 7181

hgext/rebase.py

extra['source'] = s extra['source'] = s
s = ctx.extra().get('intermediate-source', None) s = ctx.extra().get('intermediate-source', None)
if s is not None: if s is not None:
extra['intermediate-source'] = s extra['intermediate-source'] = s
def _savebranch(ctx, extra): def _savebranch(ctx, extra):
extra['branch'] = ctx.branch() extra['branch'] = ctx.branch()
def _makeextrafn(copiers):
"""make an extrafn out of the given copy-functions.
A copy function takes a context and an extra dict, and mutates the
extra dict as needed based on the given context.
"""
def extrafn(ctx, extra):
for c in copiers:
c(ctx, extra)
return extrafn
def _destrebase(repo, sourceset, destspace=None): def _destrebase(repo, sourceset, destspace=None):
"""small wrapper around destmerge to pass the right extra args """small wrapper around destmerge to pass the right extra args
Please wrap destutil.destmerge instead.""" Please wrap destutil.destmerge instead."""
return destutil.destmerge(repo, action='rebase', sourceset=sourceset, return destutil.destmerge(repo, action='rebase', sourceset=sourceset,
onheadcheck=False, destspace=destspace) onheadcheck=False, destspace=destspace)
revsetpredicate = registrar.revsetpredicate() revsetpredicate = registrar.revsetpredicate()
'''Commit the wd changes with parents p1 and p2. '''Commit the wd changes with parents p1 and p2.
Reuse commit info from rev but also store useful information in extra. Reuse commit info from rev but also store useful information in extra.
Return node of committed revision.''' Return node of committed revision.'''
repo = self.repo repo = self.repo
ctx = repo[rev] ctx = repo[rev]
if commitmsg is None: if commitmsg is None:
commitmsg = ctx.description() commitmsg = ctx.description()
extrafn = _makeextrafn(self.extrafns)
extra = {'rebase_source': ctx.hex()} extra = {'rebase_source': ctx.hex()}
if extrafn: for c in self.extrafns:
extrafn(ctx, extra) c(ctx, extra)
if self.inmemory: if self.inmemory:
newnode = concludememorynode(repo, ctx, p1, p2, newnode = concludememorynode(repo, ctx, p1, p2,
wctx=self.wctx, wctx=self.wctx,
extra=extra, extra=extra,
commitmsg=commitmsg, commitmsg=commitmsg,
editor=editor, editor=editor,
keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date) date=self.date)