This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5356

rebase: preserve working copy when redoing in-mem rebase on disk
ClosedPublic

Authored by martinvonz on Dec 3 2018, 12:50 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf07d4f94f098: rebase: preserve working copy when redoing in-mem rebase on disk
Summary

When in-memory rebase runs into conflicts, we retry it on disk. But
before we do that, we abort the in-memory rebase. That is done because
even though it's mostly in memory, there are still a few state files
written (e.g. the merge state). We should make it not write those
files so we don't need to abort, but for the stable branch, let's
explicitly clear the state we need to clear instead of running the
usual abort code.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (6 lines)
Mtests/test-rebase-inmemory.t (14 lines)

Diff 12681

hgext/rebase.py

# 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 = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
return _dorebase(ui, repo, action, opts, inmemory=inmemory) return _dorebase(ui, repo, action, opts, inmemory=inmemory)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.warn(_('hit merge conflicts; re-running rebase without in-memory' ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
' merge\n')) ' merge\n'))
_dorebase(ui, repo, action='abort', opts={}) # TODO: Make in-memory merge not use the on-disk merge state, so
# we don't have to clean it here
mergemod.mergestate.clean(repo)
clearstatus(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):
rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts)
confirm = opts.get('confirm') confirm = opts.get('confirm')
if confirm: if confirm:

tests/test-rebase-inmemory.t

$ hg rebase -s 2 -d 7 $ hg rebase -s 2 -d 7
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
merging e merging e
transaction abort! transaction abort!
rollback completed rollback completed
hit merge conflicts; re-running rebase without in-memory merge hit merge conflicts; re-running rebase without in-memory merge
rebase aborted
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort $ hg rebase --abort
saved backup bundle to $TESTTMP/repo1/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg saved backup bundle to $TESTTMP/repo1/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
rebase aborted rebase aborted
Retrying without in-memory merge won't lose working copy changes Retrying without in-memory merge won't lose working copy changes
$ cd .. $ cd ..
$ hg clone repo3 repo3-dirty -q $ hg clone repo3 repo3-dirty -q
$ cd repo3-dirty $ cd repo3-dirty
$ echo dirty > a $ echo dirty > a
$ hg rebase -s 2 -d 7 $ hg rebase -s 2 -d 7
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
merging e merging e
transaction abort! transaction abort!
rollback completed rollback completed
hit merge conflicts; re-running rebase without in-memory merge hit merge conflicts; re-running rebase without in-memory merge
rebase aborted abort: uncommitted changes
rebasing 2:177f92b77385 "c" [255]
rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e"
merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
BROKEN: working copy change to "a" was lost
$ cat a $ cat a
a dirty
Retrying without in-memory merge won't lose merge state Retrying without in-memory merge won't lose merge state
$ cd .. $ cd ..
$ hg clone repo3 repo3-merge-state -q $ hg clone repo3 repo3-merge-state -q
$ cd repo3-merge-state $ cd repo3-merge-state
$ hg merge 4 $ hg merge 4
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')