This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2712

rebase: only store collapse message once
ClosedPublic

Authored by martinvonz on Mar 7 2018, 1:23 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG6dab3bdb1f00: rebase: only store collapse message once
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 7 2018, 1:23 PM
indygreg accepted this revision.Mar 7 2018, 4:14 PM
This revision is now accepted and ready to land.Mar 7 2018, 4:14 PM
Closed by commit rHG6dab3bdb1f00: rebase: only store collapse message once (authored by martinvonz). · Explain WhyMar 7 2018, 4:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 6707

hgext/rebase.py

pos += 1 pos += 1
ui.status(_('rebasing %s\n') % desc) ui.status(_('rebasing %s\n') % desc)
ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)), ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)),
_('changesets'), total) _('changesets'), total)
p1, p2, base = defineparents(repo, rev, self.destmap, p1, p2, base = defineparents(repo, rev, self.destmap,
self.state, self.skipped, self.state, self.skipped,
self.obsoletenotrebased) self.obsoletenotrebased)
self.storestatus(tr=tr) self.storestatus(tr=tr)
storecollapsemsg(repo, self.collapsemsg)
if len(repo[None].parents()) == 2: if len(repo[None].parents()) == 2:
repo.ui.debug('resuming interrupted rebase\n') repo.ui.debug('resuming interrupted rebase\n')
else: else:
try: try:
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
'rebase') 'rebase')
stats = rebasenode(repo, rev, p1, base, self.collapsef, stats = rebasenode(repo, rev, p1, base, self.collapsef,
dest, wctx=self.wctx) dest, wctx=self.wctx)
if retcode is not None: if retcode is not None:
return retcode return retcode
else: else:
destmap = _definedestmap(ui, repo, rbsrt, destf, srcf, basef, revf, destmap = _definedestmap(ui, repo, rbsrt, destf, srcf, basef, revf,
destspace=destspace) destspace=destspace)
retcode = rbsrt._preparenewrebase(destmap) retcode = rbsrt._preparenewrebase(destmap)
if retcode is not None: if retcode is not None:
return retcode return retcode
storecollapsemsg(repo, rbsrt.collapsemsg)
tr = None tr = None
singletr = ui.configbool('rebase', 'singletransaction') singletr = ui.configbool('rebase', 'singletransaction')
if singletr: if singletr:
tr = repo.transaction('rebase') tr = repo.transaction('rebase')
# If `rebase.singletransaction` is enabled, wrap the entire operation in # If `rebase.singletransaction` is enabled, wrap the entire operation in