This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2912

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

Authored by martinvonz on Mar 21 2018, 2:10 PM.

Details

Reviewers
phillco
indygreg
Group Reviewers
hg-reviewers
Commits
rHG74f91bec6991: rebase: register status file generator only once when using single transaction
Summary

rebase.storestatus() behaved differently depending on whether a
transaction is passed to it. If a transaction is passed, it registers
a "file generator" that runs when the transaction commits. If no
transaction was passed, it writes the rebase state immediately. This
imprecise timing of the writing makes it hard to reason about, so
let's make it more explicit which behavior we're getting by checking
if we have a transaction before calling it. For the single-transaction
case, move the call to storestatus(tr) early and do it only once since
it's only going to write the file (at most) once anyway.

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 21 2018, 2:10 PM
indygreg accepted this revision.Mar 21 2018, 7:28 PM
This revision is now accepted and ready to land.Mar 21 2018, 7:28 PM
Closed by commit rHG74f91bec6991: rebase: register status file generator only once when using single transaction (authored by martinvonz). · Explain WhyMar 21 2018, 7:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (7 lines)

Diff 7204

hgext/rebase.py

# Keep track of the active bookmarks in order to reset them later # Keep track of the active bookmarks in order to reset them later
self.activebookmark = self.activebookmark or repo._activebookmark self.activebookmark = self.activebookmark or repo._activebookmark
if self.activebookmark: if self.activebookmark:
bookmarks.deactivate(repo) bookmarks.deactivate(repo)
# Store the state before we begin so users can run 'hg rebase --abort' # Store the state before we begin so users can run 'hg rebase --abort'
# if we fail before the transaction closes. # if we fail before the transaction closes.
self.storestatus() 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] cands = [k for k, v in self.state.iteritems() if v == revtodo]
total = len(cands) total = len(cands)
posholder = [0] posholder = [0]
def progress(ctx): def progress(ctx):
posholder[0] += 1 posholder[0] += 1
self.repo.ui.progress(_("rebasing"), posholder[0], self.repo.ui.progress(_("rebasing"), posholder[0],
("%d:%s" % (ctx.rev(), ctx)), ("%d:%s" % (ctx.rev(), ctx)),
self.skipped)) self.skipped))
self.state[rev] = dest self.state[rev] = dest
elif self.state[rev] == revtodo: elif self.state[rev] == revtodo:
ui.status(_('rebasing %s\n') % desc) ui.status(_('rebasing %s\n') % desc)
progressfn(ctx) progressfn(ctx)
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) if not tr:
self.storestatus()
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:
overrides = {('ui', 'forcemerge'): opts.get('tool', '')} overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, '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 stats[3] > 0: if stats[3] > 0: