This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2922

rebase: look up default date outside of conclude[memory]node()
ClosedPublic

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

Details

Reviewers
phillco
indygreg
Group Reviewers
hg-reviewers
Commits
rHG0b1230a5a958: rebase: look up default date outside of conclude[memory]node()
Summary

Diff Detail

Repository
rHG Mercurial
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.Mar 21 2018, 2:10 PM
indygreg accepted this revision.Mar 21 2018, 7:46 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
hgext/rebase.py
449–451

We could probably write this as date = self.date or ctx.date(), since date values can never be an empty string. But this is strictly equivalent to what came before. So meh.

This revision is now accepted and ready to land.Mar 21 2018, 7:46 PM
Closed by commit rHG0b1230a5a958: rebase: look up default date outside of conclude[memory]node() (authored by martinvonz). · Explain WhyMar 21 2018, 7:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (12 lines)

Diff 7214

hgext/rebase.py

'''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()
date = self.date
if date is None:
date = ctx.date()
indygregUnsubmitted
Not Done

We could probably write this as date = self.date or ctx.date(), since date values can never be an empty string. But this is strictly equivalent to what came before. So meh.

indygreg: We could probably write this as `date = self.date or ctx.date()`, since date values can never…
extra = {'rebase_source': ctx.hex()} extra = {'rebase_source': ctx.hex()}
for c in self.extrafns: for c in self.extrafns:
c(ctx, extra) c(ctx, extra)
keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch() keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch()
destphase = max(ctx.phase(), phases.draft) destphase = max(ctx.phase(), phases.draft)
overrides = {('phases', 'new-commit'): destphase} overrides = {('phases', 'new-commit'): destphase}
if keepbranch: if keepbranch:
overrides[('ui', 'allowemptycommit')] = True overrides[('ui', 'allowemptycommit')] = True
with repo.ui.configoverride(overrides, 'rebase'): with repo.ui.configoverride(overrides, 'rebase'):
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,
date=self.date) date=date)
mergemod.mergestate.clean(repo) mergemod.mergestate.clean(repo)
else: else:
newnode = concludenode(repo, ctx, p1, p2, newnode = concludenode(repo, ctx, p1, p2,
extra=extra, extra=extra,
commitmsg=commitmsg, commitmsg=commitmsg,
editor=editor, editor=editor,
date=self.date) date=date)
if newnode is None: if newnode is None:
# If it ended up being a no-op commit, then the normal # If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it # merge state clean-up path doesn't happen, so do it
# here. Fix issue5494 # here. Fix issue5494
mergemod.mergestate.clean(repo) mergemod.mergestate.clean(repo)
return newnode return newnode
def concludememorynode(repo, ctx, p1, p2, wctx, editor, extra, date, commitmsg): def concludememorynode(repo, ctx, p1, p2, wctx, editor, extra, date, commitmsg):
'''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
ctx. ctx.
Return node of committed revision.''' Return node of committed revision.'''
# Replicates the empty check in ``repo.commit``. # Replicates the empty check in ``repo.commit``.
if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'): if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
return None return None
if date is None:
date = ctx.date()
# By convention, ``extra['branch']`` (set by extrafn) clobbers # By convention, ``extra['branch']`` (set by extrafn) clobbers
# ``branch`` (used when passing ``--keepbranches``). # ``branch`` (used when passing ``--keepbranches``).
branch = repo[p1].branch() branch = repo[p1].branch()
if 'branch' in extra: if 'branch' in extra:
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, ctx, p1, p2, editor, extra, date, commitmsg): def concludenode(repo, ctx, p1, p2, editor, extra, date, commitmsg):
'''Commit the wd changes with parents p1 and p2. Reuse commit info from ctx. '''Commit the wd changes with parents p1 and p2. Reuse commit info from ctx.
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())
# Commit might fail if unresolved files exist # Commit might fail if unresolved files exist
if date is None:
date = ctx.date()
newnode = repo.commit(text=commitmsg, user=ctx.user(), newnode = repo.commit(text=commitmsg, user=ctx.user(),
date=date, extra=extra, editor=editor) date=date, extra=extra, editor=editor)
repo.dirstate.setbranch(repo[newnode].branch()) repo.dirstate.setbranch(repo[newnode].branch())
return newnode return newnode
def rebasenode(repo, rev, p1, base, collapse, dest, wctx): def rebasenode(repo, rev, p1, base, collapse, dest, wctx):
'Rebase a single revision rev on top of p1 using base as merge ancestor' 'Rebase a single revision rev on top of p1 using base as merge ancestor'