This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1245

rebase: pass wctx to rebasenode()
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Details

Reviewers
durin42
dlax
Group Reviewers
hg-reviewers
Commits
rHG259feddc04e6: rebase: pass wctx to rebasenode()
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

phillco updated this revision to Diff 4191.Dec 7 2017, 4:22 PM
phillco updated this revision to Diff 4210.Dec 7 2017, 4:44 PM
durin42 accepted this revision.Dec 7 2017, 4:59 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:59 PM
dlax requested changes to this revision.Dec 8 2017, 4:29 AM
dlax added a subscriber: dlax.
dlax added inline comments.
hgext/rebase.py
995

Isn't it meant to be used in the function body? I see a wctx = repo[None] below, perhaps it should be dropped.

But this wouldn't work with a None default value as mentioned in the next patch.

This revision now requires changes to proceed.Dec 8 2017, 4:29 AM
phillco updated this revision to Diff 4260.Dec 8 2017, 3:09 PM
phillco added inline comments.Dec 8 2017, 3:10 PM
hgext/rebase.py
995

Yes, it's used in the next patch. But you're right that it's the only callsite, so I've made it non-optional.

durin42 accepted this revision.Dec 8 2017, 3:12 PM
Closed by commit rHG259feddc04e6: rebase: pass wctx to rebasenode() (authored by phillco). · Explain WhyDec 8 2017, 3:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (4 lines)

Diff 4262

hgext/rebase.py

storecollapsemsg(repo, self.collapsemsg) storecollapsemsg(repo, self.collapsemsg)
if len(repo[None].parents()) == 2: if len(repo[None].parents()) == 2:
repo.ui.debug('resuming interrupted rebase\n') repo.ui.debug('resuming interrupted rebase\n')
else: else:
try: try:
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
'rebase') 'rebase')
stats = rebasenode(repo, rev, p1, base, self.state, stats = rebasenode(repo, rev, p1, base, self.state,
self.collapsef, dest) self.collapsef, dest, wctx=self.wctx)
if stats and stats[3] > 0: if stats and stats[3] > 0:
if self.wctx.isinmemory(): if self.wctx.isinmemory():
raise error.InMemoryMergeConflictsError() raise error.InMemoryMergeConflictsError()
else: else:
raise error.InterventionRequired( raise error.InterventionRequired(
_('unresolved conflicts (see hg ' _('unresolved conflicts (see hg '
'resolve, then hg rebase --continue)')) 'resolve, then hg rebase --continue)'))
finally: finally:
if date is None: if date is None:
date = ctx.date() 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, state, collapse, dest): def rebasenode(repo, rev, p1, base, state, collapse, dest, wctx):
dlaxUnsubmitted
Not Done

Isn't it meant to be used in the function body? I see a wctx = repo[None] below, perhaps it should be dropped.

But this wouldn't work with a None default value as mentioned in the next patch.

dlax: Isn't it meant to be used in the function body? I see a `wctx = repo[None]` below, perhaps it…
phillcoAuthorUnsubmitted
Not Done

Yes, it's used in the next patch. But you're right that it's the only callsite, so I've made it non-optional.

phillco: Yes, it's used in the next patch. But you're right that it's the only callsite, so I've made it…
'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'
# Merge phase # Merge phase
# Update to destination and merge it with local # Update to destination and merge it with local
if repo['.'].rev() != p1: if repo['.'].rev() != p1:
repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
mergemod.update(repo, p1, False, True) mergemod.update(repo, p1, False, True)
else: else:
repo.ui.debug(" already in destination\n") repo.ui.debug(" already in destination\n")