This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5622

localrepo: use context manager for transaction in commit()
ClosedPublic

Authored by martinvonz on Jan 17 2019, 12:28 AM.

Details

Reviewers
durin42
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHG57c462db87fd: localrepo: use context manager for transaction in commit()
Summary

A side-effect is that the transaction is released a little earlier, so
the "commit message saved in ..." messages now comes after the
"rollback completed" message. That seems slightly better to me.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jan 17 2019, 12:28 AM
lothiraldan added a subscriber: lothiraldan.Jan 17 2019, 3:41 AM

I have the impression that the test changes are due to the previous patch in the stack.

martinvonz added a comment.Jan 17 2019, 3:45 AM
In D5622#83011, @lothiraldan wrote:

I have the impression that the test changes are due to the previous patch in the stack.

I don't think so. See commit message for why I think they changed.

lothiraldan accepted this revision.Jan 18 2019, 1:59 AM
In D5622#83013, @martinvonz wrote:
In D5622#83011, @lothiraldan wrote:

I have the impression that the test changes are due to the previous patch in the stack.

I don't think so. See commit message for why I think they changed.

Right, I was confused between the time the transaction was closed and the time the transaction was released.

Closed by commit rHG57c462db87fd: localrepo: use context manager for transaction in commit() (authored by martinvonz). · Explain WhyJan 25 2019, 3:01 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13305

mercurial/localrepo.py

if not match: if not match:
match = matchmod.always(self.root, '') match = matchmod.always(self.root, '')
if not force: if not force:
vdirs = [] vdirs = []
match.explicitdir = vdirs.append match.explicitdir = vdirs.append
match.bad = fail match.bad = fail
wlock = lock = tr = None wlock = lock = None
try: try:
wlock = self.wlock() wlock = self.wlock()
lock = self.lock() # for recent changelog (see issue4368) lock = self.lock() # for recent changelog (see issue4368)
wctx = self[None] wctx = self[None]
merge = len(wctx.parents()) > 1 merge = len(wctx.parents()) > 1
if not force and merge and not match.always(): if not force and merge and not match.always():
newstate[s] = (newstate[s][0], sr) newstate[s] = (newstate[s][0], sr)
subrepoutil.writestate(self, newstate) subrepoutil.writestate(self, newstate)
p1, p2 = self.dirstate.parents() p1, p2 = self.dirstate.parents()
hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '') hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
try: try:
self.hook("precommit", throw=True, parent1=hookp1, self.hook("precommit", throw=True, parent1=hookp1,
parent2=hookp2) parent2=hookp2)
tr = self.transaction('commit') with self.transaction('commit'):
ret = self.commitctx(cctx, True) ret = self.commitctx(cctx, True)
# update bookmarks, dirstate and mergestate # update bookmarks, dirstate and mergestate
bookmarks.update(self, [p1, p2], ret) bookmarks.update(self, [p1, p2], ret)
cctx.markcommitted(ret) cctx.markcommitted(ret)
ms.reset() ms.reset()
tr.close()
except: # re-raises except: # re-raises
if edited: if edited:
self.ui.write( self.ui.write(
_('note: commit message saved in %s\n') % msgfn) _('note: commit message saved in %s\n') % msgfn)
raise raise
finally: finally:
lockmod.release(tr, lock, wlock) lockmod.release(lock, wlock)
def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2): def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2):
# hack for command that use a temporary commit (eg: histedit) # hack for command that use a temporary commit (eg: histedit)
# temporary commit got stripped before hook release # temporary commit got stripped before hook release
if self.changelog.hasnode(ret): if self.changelog.hasnode(ret):
self.hook("commit", node=node, parent1=parent1, self.hook("commit", node=node, parent1=parent1,
parent2=parent2) parent2=parent2)
self._afterlock(commithook) self._afterlock(commithook)

tests/test-histedit-edit.t

HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit. HG: Leave message empty to abort commit.
HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: added f HG: added f
==== ====
note: commit message saved in .hg/last-message.txt
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
f f
check saving last-message.txt check saving last-message.txt
(test also that editor is invoked if histedit is continued for "message" (test also that editor is invoked if histedit is continued for "message"
action) action)
$ HGEDITOR=cat hg histedit --continue $ HGEDITOR=cat hg histedit --continue
f f
HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit. HG: Leave message empty to abort commit.
HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: added f HG: added f
note: commit message saved in .hg/last-message.txt
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [hooks] > [hooks]
> pretxncommit.unexpectedabort = > pretxncommit.unexpectedabort =
> EOF > EOF
$ hg histedit --abort -q $ hg histedit --abort -q

tests/test-mq-qnew.t

HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to use default message. HG: Leave message empty to use default message.
HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: no files changed HG: no files changed
==== ====
note: commit message saved in .hg/last-message.txt
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
test saving last-message.txt test saving last-message.txt
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [hooks] > [hooks]
> pretxncommit.unexpectedabort = > pretxncommit.unexpectedabort =
> EOF > EOF

tests/test-rollback.t

precious commit message precious commit message
same thing, but run $EDITOR same thing, but run $EDITOR
$ cat > editor.sh << '__EOF__' $ cat > editor.sh << '__EOF__'
> echo "another precious commit message" > "$1" > echo "another precious commit message" > "$1"
> __EOF__ > __EOF__
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1
note: commit message saved in .hg/last-message.txt
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt
abort: pretxncommit hook exited with status * (glob) abort: pretxncommit hook exited with status * (glob)
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
another precious commit message another precious commit message
test rollback on served repository test rollback on served repository
#if serve #if serve

tests/test-tag.t

HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit. HG: Leave message empty to abort commit.
HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'tag-and-branch-same-name' HG: branch 'tag-and-branch-same-name'
HG: changed .hgtags HG: changed .hgtags
==== ====
note: commit message saved in .hg/last-message.txt
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
custom tag message custom tag message
second line second line
$ cat >> .hg/hgrc << '__EOF__' $ cat >> .hg/hgrc << '__EOF__'
> [hooks] > [hooks]