This is an archive of the discontinued Mercurial Phabricator instance.

commit: print "commit message saved in" message also if bookmark update fails
ClosedPublic

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

Reviewers

None

Group Reviewers

hg-reviewers

Commits

Summary

The bookmark update is done within the same transaction, so if fails,
the commit will also be rolled back.

I just happened to notice this while messing with this code; we have
not had reports of crashing bookmark updates from our users.

The same applies to the clearing of the merge state, although I don't
think that's currently tied into the transaction.

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			mercurial/localrepo.py (10 lines)

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Jan 16 2019, 8:46 PM

Status	Author	Revision
Closed	martinvonz	D5624 localrepo: use context manager for lock and transaction in commitctx()
Closed	martinvonz	D5623 localrepo: use context manager for locks in commit()
Closed	martinvonz	D5622 localrepo: use context manager for transaction in commit()
Closed	martinvonz	D5621 commit: print "commit message saved in" message also if bookmark update fails


	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')			tr = self.transaction('commit')
	ret = self.commitctx(cctx, True)			ret = self.commitctx(cctx, True)
	except: # re-raises
	if edited:
	self.ui.write(
	_('note: commit message saved in %s\n') % msgfn)
	raise
	# 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()			tr.close()
				except: # re-raises
				if edited:
				self.ui.write(
				_('note: commit message saved in %s\n') % msgfn)
				raise

	finally:			finally:
	lockmod.release(tr, lock, wlock)			lockmod.release(tr, 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):