( )⚙ D100 mergedriver: move state writing into wlock

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D100

mergedriver: move state writing into wlock
ClosedPublic

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

Details

Reviewers
simonfar
Group Reviewers
Restricted Project
Commits
rFBHGXac22b1a40b0a: mergedriver: move state writing into wlock
Summary

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

Test Plan

Test now passes

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

durham created this revision.Jul 17 2017, 5:40 AM
simonfar accepted this revision.Jul 17 2017, 6:31 AM
This revision is now accepted and ready to land.Jul 17 2017, 6:31 AM
Closed by commit rFBHGXac22b1a40b0a: mergedriver: move state writing into wlock (authored by durham). · Explain WhyJul 17 2017, 7:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/mergedriver.py (13 lines)

Diff 186

hgext3rd/mergedriver.py

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()