This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7298

rebase: check for unfinished ops even when inmemory (issue6214)
ClosedPublic

Authored by spectral on Nov 6 2019, 9:34 PM.

Details

Reviewers
martinvonz
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb56c6647f65e: rebase: check for unfinished ops even when inmemory (issue6214)
Summary

When using rebase.experimental.inmemory, we should be able to work well with a
dirty working directory, but we can not reliably work if we're in the middle of
another operation (such as another rebase), as we'll potentially stomp on some
state that the other operation needs.

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

spectral created this revision.Nov 6 2019, 9:34 PM
pulkit accepted this revision.Nov 11 2019, 6:45 AM
This revision is now accepted and ready to land.Nov 11 2019, 6:45 AM

Revision Contents
Changeset List

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

Diff 18009

hgext/rebase.py

# issue5214 for details # issue5214 for details
if srcf and basef: if srcf and basef:
raise error.Abort(_(b'cannot specify both a source and a base')) raise error.Abort(_(b'cannot specify both a source and a base'))
if revf and basef: if revf and basef:
raise error.Abort(_(b'cannot specify both a revision and a base')) raise error.Abort(_(b'cannot specify both a revision and a base'))
if revf and srcf: if revf and srcf:
raise error.Abort(_(b'cannot specify both a revision and a source')) raise error.Abort(_(b'cannot specify both a revision and a source'))
if not inmemory:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
if not inmemory:
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
if ui.configbool(b'commands', b'rebase.requiredest') and not destf: if ui.configbool(b'commands', b'rebase.requiredest') and not destf:
raise error.Abort( raise error.Abort(
_(b'you must specify a destination'), _(b'you must specify a destination'),
hint=_(b'use: hg rebase -d REV'), hint=_(b'use: hg rebase -d REV'),
) )

tests/test-rebase-inmemory.t

$ echo c > c/subdir/file.txt $ echo c > c/subdir/file.txt
$ hg add c/subdir/file.txt $ hg add c/subdir/file.txt
$ hg ci -m 'c/subdir/file.txt' $ hg ci -m 'c/subdir/file.txt'
$ hg rebase -r . -d 3 -n $ hg rebase -r . -d 3 -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip) rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip)
abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3. abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3.
[255] [255]
FIXME: shouldn't need this, but when we hit path conflicts in dryrun mode, we
don't clean up rebasestate.
$ hg rebase --abort
rebase aborted
$ hg rebase -r 3 -d . -n $ hg rebase -r 3 -d . -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 3:844a7de3e617 "c" rebasing 3:844a7de3e617 "c"
abort: error: file 'c' cannot be written because 'c/' is a directory in e147e6e3c490 (containing 1 entries: c/subdir/file.txt) abort: error: file 'c' cannot be written because 'c/' is a directory in e147e6e3c490 (containing 1 entries: c/subdir/file.txt)
[255] [255]
$ cd .. $ cd ..
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
$ hg rebase -s 2 -d 7 $ hg rebase -s 2 -d 7
rebasing 2:177f92b77385 "c" abort: outstanding uncommitted merge
abort: outstanding merge conflicts (use 'hg commit' or 'hg merge --abort')
(use 'hg resolve' to resolve)
[255] [255]
$ hg resolve -l $ hg resolve -l
U e U e
========================== ==========================
Test for --confirm option| Test for --confirm option|
========================== ==========================
$ cd .. $ cd ..
rebasing 2:fb62b706688e "add b to foo" (tip) rebasing 2:fb62b706688e "add b to foo" (tip)
merging foo merging foo
hit merge conflicts; re-running rebase without in-memory merge hit merge conflicts; re-running rebase without in-memory merge
rebasing 2:fb62b706688e "add b to foo" (tip) rebasing 2:fb62b706688e "add b to foo" (tip)
merging foo merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo! (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]
$ cd $TESTTMP
Test rebasing when we're in the middle of a rebase already
$ hg init test_issue6214
$ cd test_issue6214
$ echo r0 > r0
$ hg ci -qAm 'r0'
$ echo hi > foo
$ hg ci -qAm 'hi from foo'
$ hg co -q '.^'
$ echo bye > foo
$ hg ci -qAm 'bye from foo'
$ hg co -q '.^'
$ echo unrelated > some_other_file
$ hg ci -qAm 'some unrelated changes'
$ hg log -G -T'{rev}: {desc}\n{files%"{file}\n"}'
@ 3: some unrelated changes
| some_other_file
| o 2: bye from foo
|/ foo
| o 1: hi from foo
|/ foo
o 0: r0
r0
$ hg rebase -r 2 -d 1 -t:merge3
rebasing 2:b4d249fbf8dd "bye from foo"
merging foo
hit merge conflicts; re-running rebase without in-memory merge
rebasing 2:b4d249fbf8dd "bye from foo"
merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg rebase -r 3 -d 1 -t:merge3
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')
[255]
$ hg resolve --list
U foo
$ hg resolve --all --re-merge -t:other
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
rebasing 2:b4d249fbf8dd "bye from foo"
saved backup bundle to $TESTTMP/test_issue6214/.hg/strip-backup/b4d249fbf8dd-299ec25c-rebase.hg
$ hg log -G -T'{rev}: {desc}\n{files%"{file}\n"}'
o 3: bye from foo
| foo
| @ 2: some unrelated changes
| | some_other_file
o | 1: hi from foo
|/ foo
o 0: r0
r0