Patchwork D2912: rebase: register status file generator only once when using single transaction

login
register
mail settings
Submitter phabricator
Date March 21, 2018, 11:34 p.m.
Message ID <74ca543fd98c14788099146211a5b0d6@localhost.localdomain>
Download mbox | patch
Permalink /patch/29730/
State Not Applicable
Headers show

Comments

phabricator - March 21, 2018, 11:34 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG74f91bec6991: rebase: register status file generator only once when using single transaction (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2912?vs=7175&id=7204

REVISION DETAIL
  https://phab.mercurial-scm.org/D2912

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: martinvonz, phillco, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -420,6 +420,10 @@ 
         # Store the state before we begin so users can run 'hg rebase --abort'
         # if we fail before the transaction closes.
         self.storestatus()
+        if tr:
+            # When using single transaction, store state when transaction
+            # commits.
+            self.storestatus(tr)
 
         cands = [k for k, v in self.state.iteritems() if v == revtodo]
         total = len(cands)
@@ -480,7 +484,8 @@ 
             p1, p2, base = defineparents(repo, rev, self.destmap,
                                          self.state, self.skipped,
                                          self.obsoletenotrebased)
-            self.storestatus(tr=tr)
+            if not tr:
+                self.storestatus()
             if len(repo[None].parents()) == 2:
                 repo.ui.debug('resuming interrupted rebase\n')
             else: