This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2909

rebase: remove unused default argument values from conclude[memory]node()
ClosedPublic

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

Details

Reviewers
phillco
indygreg
Group Reviewers
hg-reviewers
Commits
rHG36c4e25c3ce1: rebase: remove unused default argument values from conclude[memory]node()
Summary

It's only "commitmsg" that we don't always pass.

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:12 PM
indygreg added a subscriber: indygreg.

I wonder if it is worth creating a dedicated type to represent the fields in a commit. We have a handful of these functions around the code base where you need to pass around a bunch of values as a unit. But that would be follow-up fodder.

This revision is now accepted and ready to land.Mar 21 2018, 7:12 PM
Closed by commit rHG36c4e25c3ce1: rebase: remove unused default argument values from conclude[memory]node() (authored by martinvonz). · Explain WhyMar 21 2018, 7:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (9 lines)

Diff 7172

hgext/rebase.py

return nullrev return nullrev
if len(parents) == 1: if len(parents) == 1:
return parents.pop() return parents.pop()
raise error.Abort(_('unable to collapse on top of %d, there is more ' raise error.Abort(_('unable to collapse on top of %d, there is more '
'than one external parent: %s') % 'than one external parent: %s') %
(max(destancestors), (max(destancestors),
', '.join("%d" % p for p in sorted(parents)))) ', '.join("%d" % p for p in sorted(parents))))
def concludememorynode(repo, rev, p1, p2, wctx=None, def concludememorynode(repo, rev, p1, p2, wctx, editor, extrafn, keepbranches,
commitmsg=None, editor=None, extrafn=None, date, commitmsg=None):
keepbranches=False, date=None):
'''Commit the memory changes with parents p1 and p2. Reuse commit info from '''Commit the memory changes with parents p1 and p2. Reuse commit info from
rev but also store useful information in extra. rev but also store useful information in extra.
Return node of committed revision.''' Return node of committed revision.'''
ctx = repo[rev] ctx = repo[rev]
if commitmsg is None: if commitmsg is None:
commitmsg = ctx.description() commitmsg = ctx.description()
keepbranch = keepbranches and repo[p1].branch() != ctx.branch() keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
extra = {'rebase_source': ctx.hex()} extra = {'rebase_source': ctx.hex()}
branch = extra['branch'] branch = extra['branch']
memctx = wctx.tomemctx(commitmsg, parents=(p1, p2), date=date, memctx = wctx.tomemctx(commitmsg, parents=(p1, p2), date=date,
extra=extra, user=ctx.user(), branch=branch, editor=editor) extra=extra, user=ctx.user(), branch=branch, editor=editor)
commitres = repo.commitctx(memctx) commitres = repo.commitctx(memctx)
wctx.clean() # Might be reused wctx.clean() # Might be reused
return commitres return commitres
def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None, def concludenode(repo, rev, p1, p2, editor, extrafn, keepbranches, date,
keepbranches=False, date=None): commitmsg=None):
'''Commit the wd changes with parents p1 and p2. Reuse commit info from rev '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
but also store useful information in extra. but also store useful information in extra.
Return node of committed revision.''' Return node of committed revision.'''
dsguard = util.nullcontextmanager() dsguard = util.nullcontextmanager()
if not repo.ui.configbool('rebase', 'singletransaction'): if not repo.ui.configbool('rebase', 'singletransaction'):
dsguard = dirstateguard.dirstateguard(repo, 'rebase') dsguard = dirstateguard.dirstateguard(repo, 'rebase')
with dsguard: with dsguard:
repo.setparents(repo[p1].node(), repo[p2].node()) repo.setparents(repo[p1].node(), repo[p2].node())