( )⚙ 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 ↗(On Diff #15767)

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-abort.t (481 lines)

Diff 15637

hgext/rebase.py

obsoletewithoutsuccessorindestination.add(srcrev) obsoletewithoutsuccessorindestination.add(srcrev)
return ( return (
obsoletenotrebased, obsoletenotrebased,
obsoletewithoutsuccessorindestination, obsoletewithoutsuccessorindestination,
obsoleteextinctsuccessors, obsoleteextinctsuccessors,
) )
def _abortrebase(ui, repo):
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-abort.t

####TEST `hg abort` operation rebase
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
>
> [phases]
> publish=False
>
> [alias]
> tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
> EOF
$ hg init a
$ cd a
$ touch .hg/rebasestate
$ hg sum
parent: -1:000000000000 tip (empty repository)
branch: default
commit: (clean)
update: (current)
abort: .hg/rebasestate is incomplete
[255]
$ rm .hg/rebasestate
$ echo c1 > common
$ hg add common
$ hg ci -m C1
$ echo c2 >> common
$ hg ci -m C2
$ echo c3 >> common
$ hg ci -m C3
$ hg up -q -C 1
$ echo l1 >> extra
$ hg add extra
$ hg ci -m L1
created new head
$ sed -e 's/c2/l2/' common > common.new
$ mv common.new common
$ hg ci -m L2
$ hg phase --force --secret 2
$ hg tglog
@ 4:draft 'L2'
|
o 3:draft 'L1'
|
| o 2:secret 'C3'
|/
o 1:draft 'C2'
|
o 0:draft 'C1'
Conflicting rebase:
$ hg rebase -s 3 -d 2
rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2" (tip)
merging common
warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
Insert unsupported advisory merge record:
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
$ hg debugmergestate
* version 2 records
local: 3e046f2ecedb793b97ed32108086edd1a162f8bc
other: 46f0b057b5c061d276b91491c22151f78698abd2
labels:
local: dest
other: source
unrecognized entry: x advisory record
file extras: common (ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c)
file: common (record type "F", state "u", hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1)
local path: common (flags "")
ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
$ hg resolve -l
U common
Insert unsupported mandatory merge record:
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
$ hg debugmergestate
* version 2 records
local: 3e046f2ecedb793b97ed32108086edd1a162f8bc
other: 46f0b057b5c061d276b91491c22151f78698abd2
labels:
local: dest
other: source
file extras: common (ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c)
file: common (record type "F", state "u", hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1)
local path: common (flags "")
ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
unrecognized entry: X mandatory record
$ hg resolve -l
abort: unsupported merge state records: X
(see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
[255]
$ hg resolve -ma
abort: unsupported merge state records: X
(see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
[255]
Abort (should clear out unsupported merge state):
$ hg abort
saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg
rebase aborted
$ hg debugmergestate
no merge state found
$ hg tglog
@ 4:draft 'L2'
|
o 3:draft 'L1'
|
| o 2:secret 'C3'
|/
o 1:draft 'C2'
|
o 0:draft 'C1'
Construct new repo:
$ hg init b
$ cd b
$ echo a > a
$ hg ci -Am A
adding a
$ echo b > b
$ hg ci -Am B
adding b
$ echo c > c
$ hg ci -Am C
adding c
$ hg up -q 0
$ echo b > b
$ hg ci -Am 'B bis'
adding b
created new head
$ echo c1 > c
$ hg ci -Am C1
adding c
$ hg phase --force --secret 1
$ hg phase --public 1
Rebase and abort without generating new changesets:
$ hg tglog
@ 4:draft 'C1'
|
o 3:draft 'B bis'
|
| o 2:secret 'C'
| |
| o 1:public 'B'
|/
o 0:public 'A'
$ hg rebase -b 4 -d 2
rebasing 3:a6484957d6b9 "B bis"
note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes
rebasing 4:145842775fec "C1" (tip)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg tglog
@ 4:draft 'C1'
|
o 3:draft 'B bis'
|
| @ 2:secret 'C'
| |
| o 1:public 'B'
|/
o 0:public 'A'
$ hg rebase -a
rebase aborted
$ hg tglog
@ 4:draft 'C1'
|
o 3:draft 'B bis'
|
| o 2:secret 'C'
| |
| o 1:public 'B'
|/
o 0:public 'A'
$ cd ..
rebase abort should not leave working copy in a merge state if tip-1 is public
(issue4082)
$ hg init abortpublic
$ cd abortpublic
$ echo a > a && hg ci -Aqm a
$ hg book master
$ hg book foo
$ echo b > b && hg ci -Aqm b
$ hg up -q master
$ echo c > c && hg ci -Aqm c
$ hg phase -p -r .
$ hg up -q foo
$ echo C > c && hg ci -Aqm C
$ hg log -G --template "{rev} {desc} {bookmarks}"
@ 3 C foo
|
| o 2 c master
| |
o | 1 b
|/
o 0 a
$ hg rebase -d master -r foo
rebasing 3:6c0f977a22d8 "C" (foo tip)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg abort
rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}"
@ 3 C foo
|
| o 2 c master
| |
o | 1 b
|/
o 0 a
$ cd ..
Make sure we don't clobber changes in the working directory when the
user has somehow managed to update to a different revision (issue4009)
$ hg init noupdate
$ cd noupdate
$ hg book @
$ echo original > a
$ hg add a
$ hg commit -m a
$ echo x > b
$ hg add b
$ hg commit -m b1
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark @)
$ hg book foo
$ echo y > b
$ hg add b
$ hg commit -m b2
created new head
$ hg rebase -d @ -b foo --tool=internal:fail
rebasing 2:070cf4580bb5 "b2" (foo tip)
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3
$ hg up -C 0 # user does other stuff in the repo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mv rebasestate .hg/ # user upgrades to 2.7
$ echo new > a
$ hg up 1 # user gets an error saying to run hg rebase --abort
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')
[255]
$ cat a
new
$ hg abort
rebase aborted
$ cat a
new
$ cd ..
test aborting an interrupted series (issue5084)
$ hg init interrupted
$ cd interrupted
$ touch base
$ hg add base
$ hg commit -m base
$ touch a
$ hg add a
$ hg commit -m a
$ echo 1 > a
$ hg commit -m 1
$ touch b
$ hg add b
$ hg commit -m b
$ echo 2 >> a
$ hg commit -m c
$ touch d
$ hg add d
$ hg commit -m d
$ hg co -q 1
$ hg rm a
$ hg commit -m no-a
created new head
$ hg co 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G --template "{rev} {desc} {bookmarks}"
o 6 no-a
|
| o 5 d
| |
| o 4 c
| |
| o 3 b
| |
| o 2 1
|/
o 1 a
|
@ 0 base
$ hg --config extensions.n=$TESTDIR/failfilemerge.py rebase -s 3 -d tip
rebasing 3:3a71550954f1 "b"
rebasing 4:e80b69427d80 "c"
abort: ^C
[255]
New operations are blocked with the correct state message
$ find .hg -name '*state' -prune | sort
.hg/dirstate
.hg/merge/state
.hg/rebasestate
.hg/undo.backup.dirstate
.hg/undo.dirstate
.hg/updatestate
$ hg rebase -s 3 -d tip
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')
[255]
$ hg up .
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')
[255]
$ hg up -C .
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')
[255]
$ hg graft 3
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')
[255]
$ hg abort
saved backup bundle to $TESTTMP/a/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}"
o 6 no-a
|
| o 5 d
| |
| o 4 c
| |
| o 3 b
| |
| o 2 1
|/
o 1 a
|
@ 0 base
$ hg summary
parent: 0:df4f53cec30a
base
branch: default
commit: (clean)
update: 6 new changesets (update)
phases: 7 draft
$ cd ..
On the other hand, make sure we *do* clobber changes whenever we
haven't somehow managed to update the repo to a different revision
during a rebase (issue4661)
$ hg ini yesupdate
$ cd yesupdate
$ echo "initial data" > foo.txt
$ hg add
adding foo.txt
$ hg ci -m "initial checkin"
$ echo "change 1" > foo.txt
$ hg ci -m "change 1"
$ hg up 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "conflicting change 1" > foo.txt
$ hg ci -m "conflicting 1"
created new head
$ echo "conflicting change 2" > foo.txt
$ hg ci -m "conflicting 2"
$ hg rebase -d 1 --tool 'internal:fail'
rebasing 2:e4ea5cdc9789 "conflicting 1"
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg abort
rebase aborted
$ hg summary
parent: 3:b16646383533 tip
conflicting 2
branch: default
commit: (clean)
update: 1 new changesets, 2 branch heads (merge)
phases: 4 draft
$ cd ..
test aborting a rebase succeeds after rebasing with skipped commits onto a
public changeset (issue4896)
$ hg init succeedonpublic
$ cd succeedonpublic
$ echo 'content' > root
$ hg commit -A -m 'root' -q
set up public branch
$ echo 'content' > disappear
$ hg commit -A -m 'disappear public' -q
commit will cause merge conflict on rebase
$ echo '' > root
$ hg commit -m 'remove content public' -q
$ hg phase --public
setup the draft branch that will be rebased onto public commit
$ hg up -r 0 -q
$ echo 'content' > disappear
commit will disappear
$ hg commit -A -m 'disappear draft' -q
$ echo 'addedcontADDEDentadded' > root
commit will cause merge conflict on rebase
$ hg commit -m 'add content draft' -q
$ hg rebase -d 'public()' --tool :merge -q
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')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg abort
rebase aborted
$ cd ..
####TEST `hg abort` operation graft ####TEST `hg abort` operation graft
Testing the hg abort for `hg graft` which aborts and rollback to state Testing the hg abort for `hg graft` which aborts and rollback to state
before the graft before the graft
$ hg init abortgraft $ hg init abortgraft
$ cd abortgraft $ cd abortgraft
o 0:9092f1db7931 added a o 0:9092f1db7931 added a
$ hg phase -r 6 --public $ hg phase -r 6 --public
$ hg abort $ hg abort
cannot clean up public changesets 6ec71c037d94 cannot clean up public changesets 6ec71c037d94
graft aborted graft aborted
working directory is now at 6ec71c037d94 working directory is now at 6ec71c037d94