facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

sqldirstate: extract method issqldirstate

Browse Source 
Summary: I've done it wrong in one place so let's centralize that.

Test Plan: ran tests.

Reviewers: #mercurial, ttung, durham

Subscribers: mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D3354724
This commit is contained in:
Mateusz Kwapich 2016-05-26 17:33:17 -07:00
parent 8699e2ba59
commit f2654a8805
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sqldirstate/__init__.py
View File

@ -13,6 +13,10 @@ from mercurial import error, extensions, cmdutil, localrepo, util
from mercurial.extensions import wrapfunction
def issqldirstate(repo):
return util.safehasattr(repo, 'requirements') and \
'sqldirstate' in repo.requirements
def wrapfilecache(cls, propname, wrapper, *paths):
"""Wraps a filecache property. These can't be wrapped using the normal
wrapfunction. This should eventually go into upstream Mercurial.
@ -33,8 +37,7 @@ def wrapfilecache(cls, propname, wrapper, *paths):
_("type '%s' has no property '%s'") % (cls, propname))
def wrapjournalfiles(orig, self):
if util.safehasattr(self, 'requirements') and \
'sqldirstate' in self.requirements:
if issqldirstate(self):
files = ()
for vfs, filename in orig(self):
if filename != 'journal.dirstate':
@ -49,8 +52,7 @@ def wrapjournalfiles(orig, self):
def wrapdirstate(orig, self):
ds = orig(self)
if util.safehasattr(self, 'requirements') and \
'sqldirstate' in self.requirements:
if issqldirstate(self):
ds.__class__ = makedirstate(ds.__class__)
ds._sqlinit()
return ds
@ -62,7 +64,7 @@ def wrapnewreporequirements(orig, repo):
return reqs
def wrapshelveaborttransaction(orig, repo):
if repo.ui.configbool('format', 'sqldirstate', True):
if issqldirstate(repo):
tr = repo.currenttransaction()
repo.dirstate._writesqldirstate()
tr.abort()