From f2654a88054dfc55412ff72441628af2450950e4 Mon Sep 17 00:00:00 2001 From: Mateusz Kwapich Date: Thu, 26 May 2016 17:33:17 -0700 Subject: [PATCH] sqldirstate: extract method issqldirstate 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 --- sqldirstate/__init__.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sqldirstate/__init__.py b/sqldirstate/__init__.py index 1f8b4ae903..26e5ebd578 100644 --- a/sqldirstate/__init__.py +++ b/sqldirstate/__init__.py @@ -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()