# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2013-07-25 04:51:44
# Node ID e9351f0d9a2ab6696322bd69194c82ec4359285a
# Parent  4fed15d4c5aad72cb9ee7ddf9951ce243ddfcf1f

rebase: reorder parent check and state storage

This could cause a rebase to be 'in progress' even though it aborted.

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -258,10 +258,10 @@ def rebase(ui, repo, **opts):
             if state[rev] == -1:
                 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])),
                             _('changesets'), total)
+                p1, p2 = defineparents(repo, rev, target, state,
+                                                        targetancestors)
                 storestatus(repo, originalwd, target, state, collapsef, keepf,
                             keepbranchesf, external, activebookmark)
-                p1, p2 = defineparents(repo, rev, target, state,
-                                                        targetancestors)
                 if len(repo.parents()) == 2:
                     repo.ui.debug('resuming interrupted rebase\n')
                 else: