This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2879

rebase: on abort, don't strip commits that didn't need rebased (issue5822)
ClosedPublic

Authored by martinvonz on Mar 16 2018, 1:36 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG177f3b90335f: rebase: on abort, don't strip commits that didn't need rebased (issue5822)
Summary

I clearly missed adding this condition in 78496ac30025 (rebase: allow
rebase even if some revisions need no rebase (BC) (issue5422),
2017-05-11). Perhaps I should have opted for the "revdone" solution I
mentioned there...

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.Mar 16 2018, 1:36 AM
yuja accepted this revision.Mar 19 2018, 10:09 AM
This revision is now accepted and ready to land.Mar 19 2018, 10:09 AM
Closed by commit rHG177f3b90335f: rebase: on abort, don't strip commits that didn't need rebased (issue5822) (authored by martinvonz). · Explain WhyMar 19 2018, 10:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (3 lines)
Mtests/test-rebase-partial.t (8 lines)

Diff 7117

hgext/rebase.py

activebookmark: the name of the bookmark that should be active after the activebookmark: the name of the bookmark that should be active after the
restore''' restore'''
try: try:
# If the first commits in the rebased set get skipped during the rebase, # If the first commits in the rebased set get skipped during the rebase,
# their values within the state mapping will be the dest rev id. The # their values within the state mapping will be the dest rev id. The
# rebased list must must not contain the dest rev (issue4896) # rebased list must must not contain the dest rev (issue4896)
rebased = [s for r, s in state.items() if s >= 0 and s != destmap[r]] rebased = [s for r, s in state.items()
if s >= 0 and s != r and s != destmap[r]]
immutable = [d for d in rebased if not repo[d].mutable()] immutable = [d for d in rebased if not repo[d].mutable()]
cleanup = True cleanup = True
if immutable: if immutable:
repo.ui.warn(_("warning: can't clean up public changesets %s\n") repo.ui.warn(_("warning: can't clean up public changesets %s\n")
% ', '.join(str(repo[r]) for r in immutable), % ', '.join(str(repo[r]) for r in immutable),
hint=_("see 'hg help phases' for details")) hint=_("see 'hg help phases' for details"))
cleanup = False cleanup = False

tests/test-rebase-partial.t

> EOF > EOF
$ hg rebase -r C+D -d B $ hg rebase -r C+D -d B
rebasing 2:ef8c0fe0897b "D" (D) rebasing 2:ef8c0fe0897b "D" (D)
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (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 rebase --abort
saved backup bundle to $TESTTMP/abort/.hg/strip-backup/79f6d6ab7b14-cce2340e-backup.hg
rebase aborted rebase aborted
BROKEN: C got stripped
$ hg tglog $ hg tglog
o 2: ef8c0fe0897b D o 3: 79f6d6ab7b14 C
| |
| o 1: 594087dbaf71 B | o 2: ef8c0fe0897b D
| |
o | 1: 594087dbaf71 B
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
$ cd .. $ cd ..
Rebase with "holes". The commits after the hole should end up on the parent of Rebase with "holes". The commits after the hole should end up on the parent of
the hole (B below), not on top of the destination (A). the hole (B below), not on top of the destination (A).