This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4566

localrepo: load extensions in makelocalrepository()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe0c5017124b3: localrepo: load extensions in makelocalrepository()
Summary

Behavior does change subtly.

First, we now load the hgrc before optionally setting up the vfs ward.
That's fine: the vfs ward is for debugging and we know we won't hit it
when reading .hg/hgrc. If the loaded extension were performing repo/vfs
I/O, then we'd be worried. But extensions don't have access to the
repo object that loaded them when they are loaded. Unless they are
doing stack walking as part of module loading (which would be crazy),
they shouldn't have access to the repo that incurred their load.

Second, we now load extensions outside of the try..except IOError
block. Previously, if loading an extension raised IOError, it would
be silently ignored. I'm pretty sure the IOError is there for missing
.hgrc files and should never have been ignored for issues loading
extensions. I don't think this matters in reality because extension
loading traps I/O errors.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (18 lines)

Diff 11004

mercurial/localrepo.py

# Working directory VFS rooted at repository root. # Working directory VFS rooted at repository root.
wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
# Main VFS for .hg/ directory. # Main VFS for .hg/ directory.
hgpath = wdirvfs.join(b'.hg') hgpath = wdirvfs.join(b'.hg')
hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) hgvfs = vfsmod.vfs(hgpath, cacheaudited=True)
# The .hg/hgrc file may load extensions or contain config options
# that influence repository construction. Attempt to load it and
# process any new extensions that it may have pulled in.
try:
ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base)
except IOError:
pass
else:
extensions.loadall(ui)
return localrepository( return localrepository(
baseui=baseui, baseui=baseui,
ui=ui, ui=ui,
origroot=path, origroot=path,
wdirvfs=wdirvfs, wdirvfs=wdirvfs,
hgvfs=hgvfs, hgvfs=hgvfs,
intents=intents) intents=intents)
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:
self.ui.readconfig(self.vfs.join("hgrc"), self.root)
self._loadextensions()
except IOError:
pass
if featuresetupfuncs: if featuresetupfuncs:
self.supported = set(self._basesupported) # use private copy self.supported = set(self._basesupported) # use private copy
extmods = set(m.__name__ for n, m extmods = set(m.__name__ for n, m
in extensions.extensions(self.ui)) in extensions.extensions(self.ui))
for setupfunc in featuresetupfuncs: for setupfunc in featuresetupfuncs:
if setupfunc.__module__ in extmods: if setupfunc.__module__ in extmods:
setupfunc(self.ui, self.supported) setupfunc(self.ui, self.supported)
repo.ui.develwarn('write with no lock: "%s"' % path, repo.ui.develwarn('write with no lock: "%s"' % path,
stacklevel=3) stacklevel=3)
return ret return ret
return checksvfs return checksvfs
def close(self): def close(self):
self._writecaches() self._writecaches()
def _loadextensions(self):
extensions.loadall(self.ui)
def _writecaches(self): def _writecaches(self):
if self._revbranchcache: if self._revbranchcache:
self._revbranchcache.write() self._revbranchcache.write()
def _restrictcapabilities(self, caps): def _restrictcapabilities(self, caps):
if self.ui.configbool('experimental', 'bundle2-advertise'): if self.ui.configbool('experimental', 'bundle2-advertise'):
caps = set(caps) caps = set(caps)
capsblob = bundle2.encodecaps(bundle2.getrepocaps(self, capsblob = bundle2.encodecaps(bundle2.getrepocaps(self,