This is an archive of the discontinued Mercurial Phabricator instance.

Differential D65

histedit: create transaction outside of try
ClosedPublic

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

Details

Reviewers
dsp
durham
Group Reviewers
hg-reviewers
Commits
rHG0491004e2233: histedit: create transaction outside of try
Summary

Just a little refactoring to simplify the next patch.

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
martinvonz updated this revision to Diff 99.Jul 12 2017, 7:58 PM
dsp accepted this revision.Jul 13 2017, 11:17 AM
durham accepted this revision.Jul 13 2017, 3:52 PM
durham added a subscriber: durham.
durham added inline comments.
hgext/histedit.py
1117

It might be more technically correct to do this after state.write() happens. state.write() is intended to be called before the transaction, and it only technically works right here because it's ignoring the pending transaction (which could be fixed in the future).

martinvonz marked an inline comment as done.Jul 13 2017, 4:01 PM
martinvonz updated this revision to Diff 115.
martinvonz added inline comments.Jul 13 2017, 4:01 PM
hgext/histedit.py
1117

Good point. I did notice that state.write(). Not sure why I didn't place this after.

Closed by commit rHG0491004e2233: histedit: create transaction outside of try (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 (25 lines)

Diff 143

hgext/histedit.py

# preprocess rules so that we can hide inner folds from the user # preprocess rules so that we can hide inner folds from the user
# and only show one editor # and only show one editor
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)
pos = 0
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:
total = len(state.actions)
pos = 0
tr = None
# Don't use singletransaction by default since it rolls the entire # Don't use singletransaction by default since it rolls the entire
durhamUnsubmitted
Done

It might be more technically correct to do this after state.write() happens. state.write() is intended to be called before the transaction, and it only technically works right here because it's ignoring the pending transaction (which could be fixed in the future).

durham: It might be more technically correct to do this after state.write() happens. state.write() is…
martinvonzAuthorUnsubmitted
Not Done

Good point. I did notice that state.write(). Not sure why I didn't place this after.

martinvonz: Good point. I did notice that state.write(). Not sure why I didn't place this after.
# 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.
tr = repo.transaction('histedit') tr = repo.transaction('histedit')
try:
while state.actions: while state.actions:
state.write(tr=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()))