This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8623

rebase: add a config knob for forcing in-memory rebasing
ClosedPublic

Authored by durin42 on Jun 9 2020, 4:52 PM.

Details

Reviewers
martinvonz
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHG24a32dea6955: rebase: add a config knob for forcing in-memory rebasing
Summary

Use it in a test case where we know the rebase should proceed without
incident in-memory, so we can see tracebacks rather than
fallbacks. This makes it easier to try and debug when things are
broken.

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

durin42 created this revision.Jun 9 2020, 4:52 PM
marmoute added a subscriber: marmoute.Jun 10 2020, 5:17 AM

This looks like a job for the [devel] config section. what about. devel.rebase.in-memory=force ?

durin42 retitled this revision from rebase: add environment variable to allow forcing in-memory rebase to rebase: add a config knob for forcing in-memory rebasing.Jun 11 2020, 12:08 PM
durin42 edited the summary of this revision. (Show Details)
durin42 updated this revision to Diff 21616.
indygreg requested changes to this revision.Aug 8 2020, 4:05 PM
This revision now requires changes to proceed.Aug 8 2020, 4:05 PM
durin42 edited parent revisions, added: D8504: diff: add experimental support for "merge diffs"; removed: D8572: merge: remove special case for in-memory merge.Oct 2 2020, 2:45 PM
durin42 planned changes to this revision.
durin42 updated this revision to Diff 23029.

I rebased these, but they still need work.

pulkit accepted this revision.Jan 21 2021, 6:20 AM
durin42 added a commit: rHG24a32dea6955: rebase: add a config knob for forcing in-memory rebasing.Jan 21 2021, 7:24 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG24a32dea6955: rebase: add a config knob for forcing in-memory rebasing (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (10 lines)
Mtests/test-copies-in-changeset.t (5 lines)

Diff 25193

hgext/rebase.py

revtodostr = b'-1' revtodostr = b'-1'
# legacy revstates no longer needed in current code # legacy revstates no longer needed in current code
# -2: nullmerge, -3: revignored, -4: revprecursor, -5: revpruned # -2: nullmerge, -3: revignored, -4: revprecursor, -5: revpruned
legacystates = {b'-2', b'-3', b'-4', b'-5'} legacystates = {b'-2', b'-3', b'-4', b'-5'}
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {}
configitem = registrar.configitem(configtable)
configitem(
b'devel',
b'rebase.force-in-memory-merge',
default=False,
)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = b'ships-with-hg-core' testedwith = b'ships-with-hg-core'
def _nothingtorebase(): def _nothingtorebase():
elif inmemory: elif inmemory:
try: try:
# in-memory merge doesn't support conflicts, so if we hit any, abort # in-memory merge doesn't support conflicts, so if we hit any, abort
# and re-run as an on-disk merge. # and re-run as an on-disk merge.
overrides = {(b'rebase', b'singletransaction'): True} overrides = {(b'rebase', b'singletransaction'): True}
with ui.configoverride(overrides, b'rebase'): with ui.configoverride(overrides, b'rebase'):
return _dorebase(ui, repo, action, opts, inmemory=inmemory) return _dorebase(ui, repo, action, opts, inmemory=inmemory)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
if ui.configbool(b'devel', b'rebase.force-in-memory-merge'):
raise
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'
) )
) )
clearstatus(repo) clearstatus(repo)
clearcollapsemsg(repo) clearcollapsemsg(repo)

tests/test-copies-in-changeset.t

$ cd rebase-rename $ cd rebase-rename
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'
$ echo a2 > a $ echo a2 > a
$ hg ci -m 'modify a' $ hg ci -m 'modify a'
$ hg co -q 0 $ hg co -q 0
$ hg mv a b $ hg mv a b
$ hg ci -qm 'rename a to b' $ hg ci -qm 'rename a to b'
$ hg rebase -d 1 --config rebase.experimental.inmemory=yes Not only do we want this to run in-memory, it shouldn't fall back to
on-disk merge (no conflicts), so we force it to be in-memory
with no fallback.
$ hg rebase -d 1 --config rebase.experimental.inmemory=yes --config devel.rebase.force-in-memory-merge=yes
rebasing 2:* tip "rename a to b" (glob) rebasing 2:* tip "rename a to b" (glob)
merging a and b to b merging a and b to b
saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob) saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob)
$ hg st --change . --copies $ hg st --change . --copies
A b A b
a a
R a R a
$ cd .. $ cd ..