martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY Both functions calculated the same "keepbranch" value from the "keepbranches" we passed in, so let's make the caller do it instead. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2919 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -449,21 +449,22 @@ extra = {'rebase_source': ctx.hex()} for c in self.extrafns: c(ctx, extra) + keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch() if self.inmemory: newnode = concludememorynode(repo, ctx, p1, p2, wctx=self.wctx, extra=extra, commitmsg=commitmsg, editor=editor, - keepbranches=self.keepbranchesf, + keepbranch=keepbranch, date=self.date) mergemod.mergestate.clean(repo) else: newnode = concludenode(repo, ctx, p1, p2, extra=extra, commitmsg=commitmsg, editor=editor, - keepbranches=self.keepbranchesf, + keepbranch=keepbranch, date=self.date) if newnode is None: @@ -1023,13 +1024,11 @@ (max(destancestors), ', '.join("%d" % p for p in sorted(parents)))) -def concludememorynode(repo, ctx, p1, p2, wctx, editor, extra, keepbranches, +def concludememorynode(repo, ctx, p1, p2, wctx, editor, extra, keepbranch, date, commitmsg): '''Commit the memory changes with parents p1 and p2. Reuse commit info from ctx. Return node of committed revision.''' - keepbranch = keepbranches and repo[p1].branch() != ctx.branch() - destphase = max(ctx.phase(), phases.draft) overrides = {('phases', 'new-commit'): destphase} if keepbranch: @@ -1054,16 +1053,15 @@ wctx.clean() # Might be reused return commitres -def concludenode(repo, ctx, p1, p2, editor, extra, keepbranches, date, +def concludenode(repo, ctx, p1, p2, editor, extra, keepbranch, date, commitmsg): '''Commit the wd changes with parents p1 and p2. Reuse commit info from ctx. Return node of committed revision.''' dsguard = util.nullcontextmanager() if not repo.ui.configbool('rebase', 'singletransaction'): dsguard = dirstateguard.dirstateguard(repo, 'rebase') with dsguard: repo.setparents(repo[p1].node(), repo[p2].node()) - keepbranch = keepbranches and repo[p1].branch() != ctx.branch() destphase = max(ctx.phase(), phases.draft) overrides = {('phases', 'new-commit'): destphase} To: martinvonz, phillco, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
