This is an archive of the discontinued Mercurial Phabricator instance.

mergedriver: move state writing into wlock
ClosedPublic

Authored by durham on Jul 17 2017, 5:40 AM.

Reviewers

simonfar

Group Reviewers

Restricted Project

Commits

Summary

Upstream has added devel-warnings for writing files without the wlock. This was
one instance.

Test Plan

Test now passes

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

This revision is now accepted and ready to land.Jul 17 2017, 6:31 AM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			hgext3rd/mergedriver.py (13 lines)

	ui.warn(_('warning: skipping merge driver '			ui.warn(_('warning: skipping merge driver '
	'(you MUST regenerate artifacts afterwards)\n'))			'(you MUST regenerate artifacts afterwards)\n'))

	with ui.configoverride(overrides, 'mergedriver'):			with ui.configoverride(overrides, 'mergedriver'):
	ret = orig(ui, repo, pats, *opts)			ret = orig(ui, repo, pats, *opts)
	# load up and commit the merge state again to make sure the driver gets			# load up and commit the merge state again to make sure the driver gets
	# written out			# written out
	if backup is not None:			if backup is not None:
				with repo.wlock():
	ms = merge.mergestate.read(repo)			ms = merge.mergestate.read(repo)
	if opts.get('skip'):			if opts.get('skip'):
	# force people to resolve by hand			# force people to resolve by hand
	for f in ms.driverresolved():			for f in ms.driverresolved():
	ms.mark(f, 'u')			ms.mark(f, 'u')
	ms.commit()			ms.commit()
	return ret			return ret

	def _rundriver(repo, ms, op, wctx, labels):			def _rundriver(repo, ms, op, wctx, labels):
	ui = repo.ui			ui = repo.ui
	mergedriver = ms.mergedriver			mergedriver = ms.mergedriver
	if not mergedriver.startswith('python:'):			if not mergedriver.startswith('python:'):
	raise error.ConfigError(_("merge driver must be a python hook"))			raise error.ConfigError(_("merge driver must be a python hook"))
	ms.commit()			ms.commit()