This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9359

dispatch: pass root path in ui.readconfig() as root of main repo
ClosedPublic

Authored by pulkit on Nov 21 2020, 8:07 AM.

Details

Reviewers
Alphare
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG1441f4d57083: dispatch: pass root path in ui.readconfig() as root of main repo
Summary

Since we are reading main (shared-source) repository config options, we
should pass root as that repository root only.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (3 lines)

Diff 23612

mercurial/dispatch.py

requirements = set(fp.read().splitlines()) requirements = set(fp.read().splitlines())
if not ( if not (
requirementsmod.SHARESAFE_REQUIREMENT in requirements requirementsmod.SHARESAFE_REQUIREMENT in requirements
and requirementsmod.SHARED_REQUIREMENT in requirements and requirementsmod.SHARED_REQUIREMENT in requirements
): ):
return return
hgvfs = vfs.vfs(os.path.join(path, b".hg")) hgvfs = vfs.vfs(os.path.join(path, b".hg"))
sharedvfs = localrepo._getsharedvfs(hgvfs, requirements) sharedvfs = localrepo._getsharedvfs(hgvfs, requirements)
ui.readconfig(sharedvfs.join(b"hgrc"), path) root = sharedvfs.base
ui.readconfig(sharedvfs.join(b"hgrc"), root)
except IOError: except IOError:
pass pass
def _getlocal(ui, rpath, wd=None): def _getlocal(ui, rpath, wd=None):
"""Return (path, local ui object) for the given target path. """Return (path, local ui object) for the given target path.
Takes paths in [cwd]/.hg/hgrc into account." Takes paths in [cwd]/.hg/hgrc into account."