This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4564

localrepo: move some vfs initialization out of __init__
ClosedPublic

Authored by indygreg on Sep 13 2018, 12:29 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG2f9cdb5b3644: localrepo: move some vfs initialization out of __init__
Summary

In order to make repository types more dynamic, we'll need to move the
logic for determining repository behavior out of
localrepository.init so we can influence behavior before the type
is instantiated.

This commit starts that process by moving working directory and .hg/
vfs initialization to our new standalone function for instantiating
local repositories.

Aside from API changes, behavior should be fully backwards compatible.

.. api::

localrepository.__init__ now does less work and accepts new args

Use ``hg.repository()``, ``localrepo.instance()``, or
``localrepo.makelocalrepository()`` to obtain a new local repository
instance instead of calling the ``localrepository`` constructor
directly.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Sep 13 2018, 12:29 PM
durin42 accepted this revision.Sep 15 2018, 12:24 AM
durin42 added a subscriber: durin42.

I think I like where this is headed. Will read rest of series later.

This revision is now accepted and ready to land.Sep 15 2018, 12:24 AM
Closed by commit rHG2f9cdb5b3644: localrepo: move some vfs initialization out of __init__ (authored by indygreg). · Explain WhySep 18 2018, 5:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (64 lines)

Diff 11162

mercurial/localrepo.py

Given arguments needed to construct a local repository, this function Given arguments needed to construct a local repository, this function
derives a type suitable for representing that repository and returns an derives a type suitable for representing that repository and returns an
instance of it. instance of it.
The returned object conforms to the ``repository.completelocalrepository`` The returned object conforms to the ``repository.completelocalrepository``
interface. interface.
""" """
return localrepository(ui, path, intents=intents) # Working directory VFS rooted at repository root.
wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
# Main VFS for .hg/ directory.
hgpath = wdirvfs.join(b'.hg')
hgvfs = vfsmod.vfs(hgpath, cacheaudited=True)
return localrepository(
ui, path,
wdirvfs=wdirvfs,
hgvfs=hgvfs,
intents=intents)
@interfaceutil.implementer(repository.completelocalrepository) @interfaceutil.implementer(repository.completelocalrepository)
class localrepository(object): class localrepository(object):
# obsolete experimental requirements: # obsolete experimental requirements:
# - manifestv2: An experimental new manifest format that allowed # - manifestv2: An experimental new manifest format that allowed
# for stem compression of long paths. Experiment ended up not # for stem compression of long paths. Experiment ended up not
# being successful (repository sizes went up due to worse delta # being successful (repository sizes went up due to worse delta
# XXX shouldn't be dirstate covered by the wlock? # XXX shouldn't be dirstate covered by the wlock?
'dirstate', 'dirstate',
# XXX bisect was still a bit too messy at the time # XXX bisect was still a bit too messy at the time
# this changeset was introduced. Someone should fix # this changeset was introduced. Someone should fix
# the remainig bit and drop this line # the remainig bit and drop this line
'bisect.state', 'bisect.state',
} }
def __init__(self, baseui, path, intents=None): def __init__(self, baseui, origroot, wdirvfs, hgvfs, intents=None):
"""Create a new local repository instance. """Create a new local repository instance.
Most callers should use ``hg.repository()`` or ``localrepo.instance()`` Most callers should use ``hg.repository()``, ``localrepo.instance()``,
for obtaining a new repository object. or ``localrepo.makelocalrepository()`` for obtaining a new repository
object.
Arguments:
baseui
``ui.ui`` instance to use. A copy will be made (since new config
options may be loaded into it).
origroot
``bytes`` path to working directory root of this repository.
wdirvfs
``vfs.vfs`` rooted at the working directory.
hgvfs
``vfs.vfs`` rooted at .hg/
intents
``set`` of system strings indicating what this repo will be used
for.
""" """
self.baseui = baseui
self.ui = baseui.copy()
self.ui.copy = baseui.copy # prevent copying repo configuration
self.origroot = origroot
# vfs rooted at working directory.
self.wvfs = wdirvfs
self.root = wdirvfs.base
# vfs rooted at .hg/. Used to access most non-store paths.
self.vfs = hgvfs
self.path = hgvfs.base
self.requirements = set() self.requirements = set()
self.filtername = None self.filtername = None
# wvfs: rooted at the repository root, used to access the working copy
self.wvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
# vfs: rooted at .hg, used to access repo files outside of .hg/store
self.vfs = None
# svfs: usually rooted at .hg/store, used to access repository history # svfs: usually rooted at .hg/store, used to access repository history
# If this is a shared repository, this vfs may point to another # If this is a shared repository, this vfs may point to another
# repository's .hg/store directory. # repository's .hg/store directory.
self.svfs = None self.svfs = None
self.root = self.wvfs.base
self.path = self.wvfs.join(".hg")
self.origroot = path
self.baseui = baseui
self.ui = baseui.copy()
self.ui.copy = baseui.copy # prevent copying repo configuration
self.vfs = vfsmod.vfs(self.path, cacheaudited=True)
if (self.ui.configbool('devel', 'all-warnings') or if (self.ui.configbool('devel', 'all-warnings') or
self.ui.configbool('devel', 'check-locks')): self.ui.configbool('devel', 'check-locks')):
self.vfs.audit = self._getvfsward(self.vfs.audit) self.vfs.audit = self._getvfsward(self.vfs.audit)
# A list of callback to shape the phase if no data were found. # A list of callback to shape the phase if no data were found.
# Callback are in the form: func(repo, roots) --> processed root. # Callback are in the form: func(repo, roots) --> processed root.
# This list it to be filled by extension during repo setup # This list it to be filled by extension during repo setup
self._phasedefaults = [] self._phasedefaults = []
try: try:
self.supported.add('exp-compression-%s' % name) self.supported.add('exp-compression-%s' % name)
if not self.vfs.isdir(): if not self.vfs.isdir():
try: try:
self.vfs.stat() self.vfs.stat()
except OSError as inst: except OSError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
raise error.RepoError(_("repository %s not found") % path) raise error.RepoError(_("repository %s not found") % origroot)
else: else:
try: try:
self.requirements = scmutil.readrequires( self.requirements = scmutil.readrequires(
self.vfs, self.supported) self.vfs, self.supported)
except IOError as inst: except IOError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise