This is an archive of the discontinued Mercurial Phabricator instance.

Differential D90

morestatus: add wlock around updateargs file
ClosedPublic

Authored by durham on Jul 14 2017, 6:47 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX5dddb47deecb: morestatus: add wlock around updateargs file
Summary

Upstream has added a warning around writing files with locks. Since this file is
written as part of an update, let's just take the wlock.

Test Plan

Ran the tests

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
treeonly (bookmark) on default (branch)
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

durham created this revision.Jul 14 2017, 6:47 PM
quark accepted this revision.Jul 14 2017, 6:48 PM
quark added inline comments.
hgext3rd/morestatus.py
129–132

This could be simplified to repo.vfs.tryunlink(UPDATEARGS).

This revision is now accepted and ready to land.Jul 14 2017, 6:48 PM
Closed by commit rFBHGX5dddb47deecb: morestatus: add wlock around updateargs file (authored by durham). · Explain WhyJul 14 2017, 6:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/morestatus.py (12 lines)

Diff 167

hgext3rd/morestatus.py

wrapcommand(commands.table, 'status', statuscmd) wrapcommand(commands.table, 'status', statuscmd)
# Write down `hg update` args to show the continue command in # Write down `hg update` args to show the continue command in
# interrupted update state. # interrupted update state.
ui.setconfig('hooks', 'pre-update.morestatus', saveupdateargs) ui.setconfig('hooks', 'pre-update.morestatus', saveupdateargs)
ui.setconfig('hooks', 'post-update.morestatus', cleanupdateargs) ui.setconfig('hooks', 'post-update.morestatus', cleanupdateargs)
def saveupdateargs(repo, args, **kwargs): def saveupdateargs(repo, args, **kwargs):
# args is a string containing all flags and arguments # args is a string containing all flags and arguments
with repo.wlock():
repo.vfs.write(UPDATEARGS, args) repo.vfs.write(UPDATEARGS, args)
def cleanupdateargs(repo, **kwargs): def cleanupdateargs(repo, **kwargs):
with repo.wlock():
try: try:
repo.vfs.unlink(UPDATEARGS) repo.vfs.unlink(UPDATEARGS)
except Exception: except Exception:
pass pass
quarkUnsubmitted
Not Done

This could be simplified to repo.vfs.tryunlink(UPDATEARGS).

quark: This could be simplified to `repo.vfs.tryunlink(UPDATEARGS)`.
def statuscmd(orig, ui, repo, *pats, **opts): def statuscmd(orig, ui, repo, *pats, **opts):
""" """
Wrap the status command to barf out the state of the repository. States Wrap the status command to barf out the state of the repository. States
being mid histediting, mid bisecting, grafting, merging, etc. being mid histediting, mid bisecting, grafting, merging, etc.
Output is to stderr to avoid breaking scripts. Output is to stderr to avoid breaking scripts.
""" """