Patchwork D2712: rebase: only store collapse message once

login
register
mail settings
Submitter phabricator
Date March 7, 2018, 6:24 p.m.
Message ID <differential-rev-PHID-DREV-vljcthbzqqq2cjalot6l-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/29099/
State Superseded
Headers show

Comments

phabricator - March 7, 2018, 6:24 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The message is determined by the user passing --message or --log when
  the rebase is started. There's no need to write it to a file for each
  rebased commit; writing it once at the start of the rebase is enough.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -478,7 +478,6 @@ 
                                              self.state, self.skipped,
                                              self.obsoletenotrebased)
                 self.storestatus(tr=tr)
-                storecollapsemsg(repo, self.collapsemsg)
                 if len(repo[None].parents()) == 2:
                     repo.ui.debug('resuming interrupted rebase\n')
                 else:
@@ -846,6 +845,7 @@ 
             retcode = rbsrt._preparenewrebase(destmap)
             if retcode is not None:
                 return retcode
+            storecollapsemsg(repo, rbsrt.collapsemsg)
 
         tr = None