This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9057

rebase: stop clearing on-disk mergestate when running in memory
ClosedPublic

Authored by martinvonz on Sep 18 2020, 6:23 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb4abfe142ff6: rebase: stop clearing on-disk mergestate when running in memory
Summary

In-memory merge no longer uses on-disk mergestate since 19590b126764
(merge: use in-memory mergestate when using in-memory context,
2020-09-15). This patch removes the clearing from two places in the
in-memory rebase code. I've verified that the one with a TODO was
indeed fixed by the aforementioned commit. The other instance doesn't
seem to have any test coverage, but I'm pretty confident it's also
safe to remove.

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.Sep 18 2020, 6:23 PM
pulkit accepted this revision.Sep 19 2020, 3:32 AM
This revision is now accepted and ready to land.Sep 19 2020, 3:32 AM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (4 lines)

Diff 22744

hgext/rebase.py

repo, repo,
wctx=self.wctx, wctx=self.wctx,
extra=extra, extra=extra,
commitmsg=commitmsg, commitmsg=commitmsg,
editor=editor, editor=editor,
user=ctx.user(), user=ctx.user(),
date=date, date=date,
) )
mergestatemod.mergestate.clean(repo)
else: else:
newnode = commitnode( newnode = commitnode(
repo, repo,
extra=extra, extra=extra,
commitmsg=commitmsg, commitmsg=commitmsg,
editor=editor, editor=editor,
user=ctx.user(), user=ctx.user(),
date=date, date=date,
return _dorebase(ui, repo, action, opts, inmemory=inmemory) return _dorebase(ui, repo, action, opts, inmemory=inmemory)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.warn( ui.warn(
_( _(
b'hit merge conflicts; re-running rebase without in-memory' b'hit merge conflicts; re-running rebase without in-memory'
b' merge\n' b' merge\n'
) )
) )
# TODO: Make in-memory merge not use the on-disk merge state, so
# we don't have to clean it here
mergestatemod.mergestate.clean(repo)
clearstatus(repo) clearstatus(repo)
clearcollapsemsg(repo) clearcollapsemsg(repo)
return _dorebase(ui, repo, action, opts, inmemory=False) return _dorebase(ui, repo, action, opts, inmemory=False)
else: else:
return _dorebase(ui, repo, action, opts) return _dorebase(ui, repo, action, opts)
def _dryrunrebase(ui, repo, action, opts): def _dryrunrebase(ui, repo, action, opts):