This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5357

rebase: abort in-mem rebase if there's a dirty merge state
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6f679f25fd4d: rebase: abort in-mem rebase if there's a dirty merge state
Summary

In-memory merge uses the on-disk merge state, so we should not allow
it run in-memory merge when the merge state is not clean. We should
probably not use the on-disk merge state when running in-memory merge,
but chaning that is not suitable for the stable branch.

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.Dec 3 2018, 12:50 PM
Closed by commit rHG6f679f25fd4d: rebase: abort in-mem rebase if there's a dirty merge state (authored by martinvonz). · Explain WhyDec 3 2018, 3:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)
Mtests/test-rebase-inmemory.t (11 lines)

Diff 12682

hgext/rebase.py

self.skipped)) self.skipped))
self.state[rev] = dest self.state[rev] = dest
elif self.state[rev] == revtodo: elif self.state[rev] == revtodo:
ui.status(_('rebasing %s\n') % desc) ui.status(_('rebasing %s\n') % desc)
progressfn(ctx) progressfn(ctx)
p1, p2, base = defineparents(repo, rev, self.destmap, p1, p2, base = defineparents(repo, rev, self.destmap,
self.state, self.skipped, self.state, self.skipped,
self.obsoletenotrebased) self.obsoletenotrebased)
if len(repo[None].parents()) == 2: if not self.inmemory and len(repo[None].parents()) == 2:
repo.ui.debug('resuming interrupted rebase\n') repo.ui.debug('resuming interrupted rebase\n')
else: else:
overrides = {('ui', 'forcemerge'): opts.get('tool', '')} overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
stats = rebasenode(repo, rev, p1, base, self.collapsef, stats = rebasenode(repo, rev, p1, base, self.collapsef,
dest, wctx=self.wctx) dest, wctx=self.wctx)
if stats.unresolvedcount > 0: if stats.unresolvedcount > 0:
if self.inmemory: if self.inmemory:

tests/test-rebase-inmemory.t

$ 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')
2 files updated, 0 files merged, 0 files removed, 1 files unresolved 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg resolve -l $ hg resolve -l
U e U e
BROKEN: these should not say "created no changes to commit"
$ hg rebase -s 2 -d 7 $ hg rebase -s 2 -d 7
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
note: rebase of 2:177f92b77385 created no changes to commit abort: outstanding merge conflicts
rebasing 3:055a42cdd887 "d" [255]
note: rebase of 3:055a42cdd887 created no changes to commit
rebasing 4:e860deea161a "e"
note: rebase of 4:e860deea161a created no changes to commit
saved backup bundle to $TESTTMP/repo1/repo3-merge-state/.hg/strip-backup/177f92b77385-4da7ba9e-rebase.hg
BROKEN: merge state lost
$ hg resolve -l $ hg resolve -l
U e
========================== ==========================
Test for --confirm option| Test for --confirm option|
========================== ==========================
$ cd .. $ cd ..
$ hg clone repo3 repo4 -q $ hg clone repo3 repo4 -q
$ cd repo4 $ cd repo4
$ hg strip 7 -q $ hg strip 7 -q