This is an archive of the discontinued Mercurial Phabricator instance.

Differential D64

histedit: remove transaction from state object
ClosedPublic

Authored by martinvonz on Jul 12 2017, 5:38 PM.

Details

Reviewers
phillco
dsp
durham
Group Reviewers
hg-reviewers
Commits
rHGc4e39512a661: histedit: remove transaction from state object
Summary

The transaction is only used within a single function, so no need to
store it on the state object.

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.Jul 12 2017, 5:38 PM
phillco accepted this revision.Jul 12 2017, 7:12 PM
dsp accepted this revision.Jul 12 2017, 7:55 PM
dsp added a subscriber: dsp.
dsp added inline comments.
hgext/histedit.py
283

I think you can also remove this. I don't see it anywhere used.

martinvonz marked an inline comment as done.Jul 12 2017, 7:58 PM
martinvonz updated this revision to Diff 98.
martinvonz added inline comments.Jul 12 2017, 7:58 PM
hgext/histedit.py
283

I thought I did, but apparently not.

dsp accepted this revision.Jul 13 2017, 11:16 AM
durham accepted this revision.Jul 13 2017, 3:53 PM
Closed by commit rHGc4e39512a661: histedit: remove transaction from state object (authored by martinvonz). · Explain WhyJul 14 2017, 1:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (19 lines)

Diff 142

hgext/histedit.py

self.repo = repo self.repo = repo
self.actions = actions self.actions = actions
self.keep = keep self.keep = keep
self.topmost = topmost self.topmost = topmost
self.parentctxnode = parentctxnode self.parentctxnode = parentctxnode
self.lock = lock self.lock = lock
self.wlock = wlock self.wlock = wlock
self.backupfile = None self.backupfile = None
self.tr = None
dspUnsubmitted
Done

I think you can also remove this. I don't see it anywhere used.

dsp: I think you can also remove this. I don't see it anywhere used.
martinvonzAuthorUnsubmitted
Not Done

I thought I did, but apparently not.

martinvonz: I thought I did, but apparently not.
if replacements is None: if replacements is None:
self.replacements = [] self.replacements = []
else: else:
self.replacements = replacements self.replacements = replacements
def read(self): def read(self):
"""Load histedit state from disk and set fields appropriately.""" """Load histedit state from disk and set fields appropriately."""
try: try:
actions = state.actions[:] actions = state.actions[:]
for idx, (action, nextact) in enumerate( for idx, (action, nextact) in enumerate(
zip(actions, actions[1:] + [None])): zip(actions, actions[1:] + [None])):
if action.verb == 'fold' and nextact and nextact.verb == 'fold': if action.verb == 'fold' and nextact and nextact.verb == 'fold':
state.actions[idx].__class__ = _multifold state.actions[idx].__class__ = _multifold
total = len(state.actions) total = len(state.actions)
pos = 0 pos = 0
state.tr = None tr = None
# Force an initial state file write, so the user can run --abort/continue # Force an initial state file write, so the user can run --abort/continue
# even if there's an exception before the first transaction serialize. # even if there's an exception before the first transaction serialize.
state.write() state.write()
try: try:
# Don't use singletransaction by default since it rolls the entire # Don't use singletransaction by default since it rolls the entire
# transaction back if an unexpected exception happens (like a # transaction back if an unexpected exception happens (like a
# pretxncommit hook throws, or the user aborts the commit msg editor). # pretxncommit hook throws, or the user aborts the commit msg editor).
if ui.configbool("histedit", "singletransaction", False): if ui.configbool("histedit", "singletransaction", False):
# Don't use a 'with' for the transaction, since actions may close # Don't use a 'with' for the transaction, since actions may close
# and reopen a transaction. For example, if the action executes an # and reopen a transaction. For example, if the action executes an
# external process it may choose to commit the transaction first. # external process it may choose to commit the transaction first.
state.tr = repo.transaction('histedit') tr = repo.transaction('histedit')
while state.actions: while state.actions:
state.write(tr=state.tr) state.write(tr=tr)
actobj = state.actions[0] actobj = state.actions[0]
pos += 1 pos += 1
ui.progress(_("editing"), pos, actobj.torule(), ui.progress(_("editing"), pos, actobj.torule(),
_('changes'), total) _('changes'), total)
ui.debug('histedit: processing %s %s\n' % (actobj.verb,\ ui.debug('histedit: processing %s %s\n' % (actobj.verb,\
actobj.torule())) actobj.torule()))
parentctx, replacement_ = actobj.run() parentctx, replacement_ = actobj.run()
state.parentctxnode = parentctx.node() state.parentctxnode = parentctx.node()
state.replacements.extend(replacement_) state.replacements.extend(replacement_)
state.actions.pop(0) state.actions.pop(0)
if state.tr is not None: if tr is not None:
state.tr.close() tr.close()
except error.InterventionRequired: except error.InterventionRequired:
if state.tr is not None: if tr is not None:
state.tr.close() tr.close()
raise raise
except Exception: except Exception:
if state.tr is not None: if tr is not None:
state.tr.abort() tr.abort()
raise raise
state.write() state.write()
ui.progress(_("editing"), None) ui.progress(_("editing"), None)
def _finishhistedit(ui, repo, state): def _finishhistedit(ui, repo, state):
"""This action runs when histedit is finishing its session""" """This action runs when histedit is finishing its session"""
repo.ui.pushbuffer() repo.ui.pushbuffer()