This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8197

cleanup: remove redundant clearing of mergestate in rebase and shelve
ClosedPublic

Authored by martinvonz on Feb 28 2020, 2:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf0021fbedea9: cleanup: remove redundant clearing of mergestate in rebase and shelve
Summary

repo.commit() now clears the merge state even if it ends up not
creating a commit because there were no changes to commit.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Feb 28 2020, 2:57 PM
martinvonz added a commit: rHGf0021fbedea9: cleanup: remove redundant clearing of mergestate in rebase and shelve.Mar 4 2020, 5:09 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf0021fbedea9: cleanup: remove redundant clearing of mergestate in rebase and shelve (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (5 lines)
Mmercurial/shelve.py (8 lines)

Diff 20403

hgext/rebase.py

repo, repo,
extra=extra, extra=extra,
commitmsg=commitmsg, commitmsg=commitmsg,
editor=editor, editor=editor,
user=ctx.user(), user=ctx.user(),
date=date, date=date,
) )
if newnode is None:
# If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it
# here. Fix issue5494
mergemod.mergestate.clean(repo)
return newnode return newnode
def _rebasenode(self, tr, rev, allowdivergence, progressfn): def _rebasenode(self, tr, rev, allowdivergence, progressfn):
repo, ui, opts = self.repo, self.ui, self.opts repo, ui, opts = self.repo, self.ui, self.opts
dest = self.destmap[rev] dest = self.destmap[rev]
ctx = repo[rev] ctx = repo[rev]
desc = _ctxdesc(ctx) desc = _ctxdesc(ctx)
if self.state[rev] == rev: if self.state[rev] == rev:

mercurial/shelve.py

with repo.ui.configoverride(overrides, b'unshelve'): with repo.ui.configoverride(overrides, b'unshelve'):
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(state.parents[0], nodemod.nullid) repo.setparents(state.parents[0], nodemod.nullid)
newnode, ispartialunshelve = _createunshelvectx( newnode, ispartialunshelve = _createunshelvectx(
ui, repo, shelvectx, basename, interactive, opts ui, repo, shelvectx, basename, interactive, opts
) )
if newnode is None: if newnode is None:
# If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it
# here. Fix issue5494
merge.mergestate.clean(repo)
shelvectx = state.pendingctx shelvectx = state.pendingctx
msg = _( msg = _(
b'note: unshelved changes already existed ' b'note: unshelved changes already existed '
b'in the working copy\n' b'in the working copy\n'
) )
ui.status(msg) ui.status(msg)
else: else:
# only strip the shelvectx if we produced one # only strip the shelvectx if we produced one
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(tmpwctx.node(), nodemod.nullid) repo.setparents(tmpwctx.node(), nodemod.nullid)
newnode, ispartialunshelve = _createunshelvectx( newnode, ispartialunshelve = _createunshelvectx(
ui, repo, shelvectx, basename, interactive, opts ui, repo, shelvectx, basename, interactive, opts
) )
if newnode is None: if newnode is None:
# If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it
# here. Fix issue5494
merge.mergestate.clean(repo)
shelvectx = tmpwctx shelvectx = tmpwctx
msg = _( msg = _(
b'note: unshelved changes already existed ' b'note: unshelved changes already existed '
b'in the working copy\n' b'in the working copy\n'
) )
ui.status(msg) ui.status(msg)
else: else:
shelvectx = repo[newnode] shelvectx = repo[newnode]