This is an archive of the discontinued Mercurial Phabricator instance.

Differential D643

rebase: use unfiltered repo when loading state
ClosedPublic

Authored by quark on Sep 6 2017, 6:26 PM.

Details

Reviewers
durham
Group Reviewers
hg-reviewers
Commits
rHG15ec3119d500: rebase: use unfiltered repo when loading state
Summary

Before this patch, rebase --abort may fail to do the cleanup:

$ hg rebase --abort
rebase aborted (no revision is removed, only broken state is cleared)

The added test case makes sure --abort works in this case.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Sep 6 2017, 6:26 PM
martinvonz added a subscriber: martinvonz.Sep 6 2017, 7:07 PM

Equally important is that --continue works after this :-)

quark updated this revision to Diff 1680.Sep 7 2017, 7:17 PM
durham accepted this revision.Sep 7 2017, 8:30 PM
Closed by commit rHG15ec3119d500: rebase: use unfiltered repo when loading state (authored by quark). · Explain WhySep 11 2017, 2:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)
Mtests/test-rebase-obsolete.t (70 lines)

Diff 1641

hgext/rebase.py

else: else:
newrev = v newrev = v
destnode = repo[destmap[d]].hex() destnode = repo[destmap[d]].hex()
f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) f.write("%s:%s:%s\n" % (oldrev, newrev, destnode))
repo.ui.debug('rebase status stored\n') repo.ui.debug('rebase status stored\n')
def restorestatus(self): def restorestatus(self):
"""Restore a previously stored status""" """Restore a previously stored status"""
repo = self.repo repo = self.repo.unfiltered()
keepbranches = None keepbranches = None
legacydest = None legacydest = None
collapse = False collapse = False
external = nullrev external = nullrev
activebookmark = None activebookmark = None
state = {} state = {}
destmap = {} destmap = {}

tests/test-rebase-obsolete.t

| o 6:ecc93090a95c E | o 6:ecc93090a95c E
| | | |
| o 4:0dc878468a23 B3 | o 4:0dc878468a23 B3
| | | |
o | 1:96cc3511f894 C o | 1:96cc3511f894 C
/ /
o 0:426bada5c675 A o 0:426bada5c675 A
For some reasons (--hidden, rebaseskipobsolete=0, directaccess, etc.),
rebasestate may contain hidden hashes. "rebase --abort" should work regardless.
$ hg init $TESTTMP/hidden-state1
$ cd $TESTTMP/hidden-state1
$ cat >> .hg/hgrc <<EOF
> [experimental]
> rebaseskipobsolete=0
> EOF
$ hg debugdrawdag <<'EOS'
> C
> |
> D B # prune: B, C
> |/ # B/D=B
> A
> EOS
$ eval `hg tags -T '{tag}={node}\n'`
$ rm .hg/localtags
$ hg update -q $C --hidden
$ hg rebase -s $B -d $D
rebasing 1:2ec65233581b "B"
merging D
warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ cp -R . $TESTTMP/hidden-state2
$ hg log -G
@ 2:b18e25de2cf5 D
|
| @ 1:2ec65233581b B
|/
o 0:426bada5c675 A
$ hg summary
parent: 2:b18e25de2cf5 tip
D
parent: 1:2ec65233581b (obsolete)
B
branch: default
commit: 2 modified, 1 unknown, 1 unresolved (merge)
update: (current)
phases: 3 draft
rebase: 0 rebased, 2 remaining (rebase --continue)
$ hg rebase --abort
rebase aborted
Also test --continue for the above case
$ cd $TESTTMP/hidden-state2
$ hg resolve -m
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
rebasing 1:2ec65233581b "B"
rebasing 3:7829726be4dc "C" (tip)
$ hg log -G
@ 5:1964d5d5b547 C
|
o 4:68deb90c12a2 B
|
o 2:b18e25de2cf5 D
|
o 0:426bada5c675 A