comparison hgext/rebase.py @ 36775:6dab3bdb1f00

rebase: only store collapse message once 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. Differential Revision: https://phab.mercurial-scm.org/D2712
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 06 Mar 2018 14:29:20 -0800
parents a835bf3fe40a
children 17a744c5e270
comparison
equal deleted inserted replaced
36774:a835bf3fe40a 36775:6dab3bdb1f00
476 _('changesets'), total) 476 _('changesets'), total)
477 p1, p2, base = defineparents(repo, rev, self.destmap, 477 p1, p2, base = defineparents(repo, rev, self.destmap,
478 self.state, self.skipped, 478 self.state, self.skipped,
479 self.obsoletenotrebased) 479 self.obsoletenotrebased)
480 self.storestatus(tr=tr) 480 self.storestatus(tr=tr)
481 storecollapsemsg(repo, self.collapsemsg)
482 if len(repo[None].parents()) == 2: 481 if len(repo[None].parents()) == 2:
483 repo.ui.debug('resuming interrupted rebase\n') 482 repo.ui.debug('resuming interrupted rebase\n')
484 else: 483 else:
485 try: 484 try:
486 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 485 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
844 destmap = _definedestmap(ui, repo, rbsrt, destf, srcf, basef, revf, 843 destmap = _definedestmap(ui, repo, rbsrt, destf, srcf, basef, revf,
845 destspace=destspace) 844 destspace=destspace)
846 retcode = rbsrt._preparenewrebase(destmap) 845 retcode = rbsrt._preparenewrebase(destmap)
847 if retcode is not None: 846 if retcode is not None:
848 return retcode 847 return retcode
848 storecollapsemsg(repo, rbsrt.collapsemsg)
849 849
850 tr = None 850 tr = None
851 851
852 singletr = ui.configbool('rebase', 'singletransaction') 852 singletr = ui.configbool('rebase', 'singletransaction')
853 if singletr: 853 if singletr: