Skip to content
Snippets Groups Projects
Commit e9351f0d authored by Matt Mackall's avatar Matt Mackall
Browse files

rebase: reorder parent check and state storage

This could cause a rebase to be 'in progress' even though it aborted.
parent 4fed15d4
No related branches found
No related tags found
No related merge requests found
...@@ -258,5 +258,7 @@ ...@@ -258,5 +258,7 @@
if state[rev] == -1: if state[rev] == -1:
ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])),
_('changesets'), total) _('changesets'), total)
p1, p2 = defineparents(repo, rev, target, state,
targetancestors)
storestatus(repo, originalwd, target, state, collapsef, keepf, storestatus(repo, originalwd, target, state, collapsef, keepf,
keepbranchesf, external, activebookmark) keepbranchesf, external, activebookmark)
...@@ -261,7 +263,5 @@ ...@@ -261,7 +263,5 @@
storestatus(repo, originalwd, target, state, collapsef, keepf, storestatus(repo, originalwd, target, state, collapsef, keepf,
keepbranchesf, external, activebookmark) keepbranchesf, external, activebookmark)
p1, p2 = defineparents(repo, rev, target, state,
targetancestors)
if len(repo.parents()) == 2: if len(repo.parents()) == 2:
repo.ui.debug('resuming interrupted rebase\n') repo.ui.debug('resuming interrupted rebase\n')
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment