( )⚙ D6568 abort: added support for rebase

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6568

abort: added support for rebase
ClosedPublic

Authored by taapas1128 on Jun 23 2019, 1:43 PM.

Details

Reviewers
martinvonz
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb9bc47211cf5: abort: added support for rebase
Summary

This adds support of rebase to hg abort plan.

An independent abort logic for rebase is created
under abortrebase() function. For this a seperate
rebaseruntime object is created under the function to
handle an unfinished rebasestate and abort that using
abort logic under _prepareabortorcontinue.

Results of tests are shown.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jun 23 2019, 1:43 PM
taapas1128 updated this revision to Diff 15733.Jul 1 2019, 5:50 PM
pulkit added a subscriber: pulkit.Jul 2 2019, 5:36 PM

Since we both are discussing and working on this, we can understand why this patch does what it does. It will be nice to have more explained commit descriptions which explain why we need to have an function independent of rebase-runtime-state object. This applies to all the patches in the series. In the hg abort patch, explaining how it works will be good.

taapas1128 edited the summary of this revision. (Show Details)Jul 3 2019, 7:01 PM
taapas1128 updated this revision to Diff 15752.
taapas1128 added a comment.Jul 3 2019, 7:06 PM

@pulkit I have updated the descriptions.

taapas1128 updated this revision to Diff 15767.Jul 4 2019, 5:07 PM
pulkit added inline comments.Jul 5 2019, 5:56 PM
hgext/rebase.py
1926

we can name this function abortrebase, no need to add hg in front.

1928

aborting rebase ..

tests/test-rebase-abort.t
128

This message means that we are aborting rebase. Rather we should print something like, rebase in progress, will be aborted.

taapas1128 edited the summary of this revision. (Show Details)Jul 6 2019, 2:48 PM
taapas1128 updated this revision to Diff 15780.
taapas1128 marked 2 inline comments as done.Jul 6 2019, 2:58 PM
taapas1128 edited the summary of this revision. (Show Details)Jul 8 2019, 2:17 PM
taapas1128 updated this revision to Diff 15805.
pulkit added inline comments.Jul 9 2019, 6:31 AM
hgext/rebase.py
1929

If I am correct, the call to abort from hg rebase --abort does not pass backup and suppwarns as these values.

Look for line 1023 in this file.

taapas1128 edited the summary of this revision. (Show Details)Jul 9 2019, 8:24 AM
taapas1128 updated this revision to Diff 15832.
taapas1128 marked an inline comment as done.Jul 9 2019, 8:28 AM
pulkit accepted this revision.Jul 10 2019, 8:41 AM
This revision is now accepted and ready to land.Jul 10 2019, 8:41 AM
taapas1128 added a commit: rHGb9bc47211cf5: abort: added support for rebase.Jul 10 2019, 9:13 AM
Closed by commit rHGb9bc47211cf5: abort: added support for rebase (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (8 lines)
Mtests/test-rebase-abort.t (34 lines)

Diff 15805

hgext/rebase.py

obsoletewithoutsuccessorindestination.add(srcrev) obsoletewithoutsuccessorindestination.add(srcrev)
return ( return (
obsoletenotrebased, obsoletenotrebased,
obsoletewithoutsuccessorindestination, obsoletewithoutsuccessorindestination,
obsoleteextinctsuccessors, obsoleteextinctsuccessors,
) )
def abortrebase(ui, repo, **opts):
pulkitUnsubmitted
Done

we can name this function abortrebase, no need to add hg in front.

pulkit: we can name this function abortrebase, no need to add hg in front.
with repo.wlock(), repo.lock():
rbsrt = rebaseruntime(repo, ui)
pulkitUnsubmitted
Done

aborting rebase ..

pulkit: `aborting rebase ..`
rbsrt._prepareabortorcontinue(isabort=True, backup=True,
pulkitUnsubmitted
Done

If I am correct, the call to abort from hg rebase --abort does not pass backup and suppwarns as these values.

Look for line 1023 in this file.

pulkit: If I am correct, the call to abort from `hg rebase --abort` does not pass backup and suppwarns…
suppwarns=False)
def summaryhook(ui, repo): def summaryhook(ui, repo):
if not repo.vfs.exists('rebasestate'): if not repo.vfs.exists('rebasestate'):
return return
try: try:
rbsrt = rebaseruntime(repo, ui, {}) rbsrt = rebaseruntime(repo, ui, {})
rbsrt.restorestatus() rbsrt.restorestatus()
state = rbsrt.state state = rbsrt.state
except error.RepoLookupError: except error.RepoLookupError:
#Replace pull with a decorator to provide --rebase option #Replace pull with a decorator to provide --rebase option
entry = extensions.wrapcommand(commands.table, 'pull', pullrebase) entry = extensions.wrapcommand(commands.table, 'pull', pullrebase)
entry[1].append(('', 'rebase', None, entry[1].append(('', 'rebase', None,
_("rebase working directory to branch head"))) _("rebase working directory to branch head")))
entry[1].append(('t', 'tool', '', entry[1].append(('t', 'tool', '',
_("specify merge tool for rebase"))) _("specify merge tool for rebase")))
cmdutil.summaryhooks.add('rebase', summaryhook) cmdutil.summaryhooks.add('rebase', summaryhook)
statemod.addunfinished('rebase', fname='rebasestate', stopflag=True, statemod.addunfinished('rebase', fname='rebasestate', stopflag=True,
continueflag=True) continueflag=True, abortfunc=abortrebase)

tests/test-rebase-abort.t

#testcases abortcommand abortflag
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n" > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
> EOF > EOF
#if abortflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> abort = rebase --abort
> EOF
#endif
$ hg init a $ hg init a
$ cd a $ cd a
$ touch .hg/rebasestate $ touch .hg/rebasestate
$ hg sum $ hg sum
parent: -1:000000000000 tip (empty repository) parent: -1:000000000000 tip (empty repository)
branch: default branch: default
[255] [255]
$ hg resolve -ma $ hg resolve -ma
abort: unsupported merge state records: X abort: unsupported merge state records: X
(see https://mercurial-scm.org/wiki/MergeStateRecords for more information) (see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
[255] [255]
Abort (should clear out unsupported merge state): Abort (should clear out unsupported merge state):
$ hg rebase --abort #if abortcommand
when in dry-run mode
$ hg abort --dry-run
rebase in progress, will be aborted
pulkitUnsubmitted
Not Done

This message means that we are aborting rebase. Rather we should print something like, rebase in progress, will be aborted.

pulkit: This message means that we are aborting rebase. Rather we should print something like, `rebase…
#endif
$ hg abort
saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg
rebase aborted rebase aborted
$ hg debugmergestate $ hg debugmergestate
no merge state found no merge state found
$ hg tglog $ hg tglog
@ 4:draft 'L2' @ 4:draft 'L2'
| |
$ mv .hg/rebasestate.back .hg/rebasestate $ mv .hg/rebasestate.back .hg/rebasestate
$ hg rebase --continue $ hg rebase --continue
abort: cannot continue inconsistent rebase abort: cannot continue inconsistent rebase
(use "hg rebase --abort" to clear broken state) (use "hg rebase --abort" to clear broken state)
[255] [255]
$ hg summary | grep '^rebase: ' $ hg summary | grep '^rebase: '
rebase: (use "hg rebase --abort" to clear broken state) rebase: (use "hg rebase --abort" to clear broken state)
$ hg rebase --abort $ hg abort
rebase aborted (no revision is removed, only broken state is cleared) rebase aborted (no revision is removed, only broken state is cleared)
$ cd .. $ cd ..
Construct new repo: Construct new repo:
$ hg init b $ hg init b
$ hg rebase -d master -r foo $ hg rebase -d master -r foo
rebasing 3:6c0f977a22d8 "C" (foo tip) rebasing 3:6c0f977a22d8 "C" (foo tip)
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (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 abort
rebase aborted rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}" $ hg log -G --template "{rev} {desc} {bookmarks}"
@ 3 C foo @ 3 C foo
| |
| o 2 c master | o 2 c master
| | | |
o | 1 b o | 1 b
|/ |/
$ echo new > a $ echo new > a
$ hg up 1 # user gets an error saying to run hg rebase --abort $ hg up 1 # user gets an error saying to run hg rebase --abort
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue' or 'hg rebase --abort')
[255] [255]
$ cat a $ cat a
new new
$ hg rebase --abort $ hg abort
rebase aborted rebase aborted
$ cat a $ cat a
new new
$ cd .. $ cd ..
test aborting an interrupted series (issue5084) test aborting an interrupted series (issue5084)
$ hg init interrupted $ hg init interrupted
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue' or 'hg rebase --abort')
[255] [255]
$ hg graft 3 $ hg graft 3
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue' or 'hg rebase --abort')
[255] [255]
$ hg rebase --abort $ hg abort
saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
rebase aborted rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}" $ hg log -G --template "{rev} {desc} {bookmarks}"
o 6 no-a o 6 no-a
| |
| o 5 d | o 5 d
| | | |
| o 4 c | o 4 c
created new head created new head
$ echo "conflicting change 2" > foo.txt $ echo "conflicting change 2" > foo.txt
$ hg ci -m "conflicting 2" $ hg ci -m "conflicting 2"
$ hg rebase -d 1 --tool 'internal:fail' $ hg rebase -d 1 --tool 'internal:fail'
rebasing 2:e4ea5cdc9789 "conflicting 1" rebasing 2:e4ea5cdc9789 "conflicting 1"
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort $ hg abort
rebase aborted rebase aborted
$ hg summary $ hg summary
parent: 3:b16646383533 tip parent: 3:b16646383533 tip
conflicting 2 conflicting 2
branch: default branch: default
commit: (clean) commit: (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
phases: 4 draft phases: 4 draft
commit will cause merge conflict on rebase commit will cause merge conflict on rebase
$ hg commit -m 'add content draft' -q $ hg commit -m 'add content draft' -q
$ hg rebase -d 'public()' --tool :merge -q $ hg rebase -d 'public()' --tool :merge -q
note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes
warning: conflicts while merging root! (edit, then use 'hg resolve --mark') warning: conflicts while merging root! (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 abort
rebase aborted rebase aborted
$ cd .. $ cd ..