This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9047

dispatch: load shared source repository config in share-safe mode
ClosedPublic

Authored by pulkit on Sep 18 2020, 10:41 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGfd1de908f2b4: dispatch: load shared source repository config in share-safe mode
Summary

It seems to me now that there are two steps when config is loaded:

  1. on dispatch
  2. repository object creation

Recent patches added functionality that there can be shares in share-safe mode
where config of the source repository is shared with the the shares. However we
missed adding logic to read the source config on dispatch. This leads to
extensions not being loaded on dispatch and hence extensions command not being
recognized.

This patch fixes it by reading the shared source config on dispatch.

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

pulkit created this revision.Sep 18 2020, 10:41 AM
pulkit updated this revision to Diff 22773.Sep 23 2020, 3:22 AM
marmoute requested changes to this revision.Sep 26 2020, 6:51 AM
marmoute added a subscriber: marmoute.

The logic looks good, but I hve a minor point on about the test.

Having to call the couple of function every time seems a bit cumbersome and fragile. Maybe we should introduce a new function doing both ?

tests/test-share-safe.t
105–106

We shoulddrop the BROKEN:, should we not?

This revision now requires changes to proceed.Sep 26 2020, 6:51 AM
pulkit added inline comments.Sep 28 2020, 2:13 AM
tests/test-share-safe.t
105–106

Nope. hg debugextensions is still broken as it shows list of extension according to config values specified and not according to ones which are loaded while running a command. The previous patch demonstrates that. This patch does not fix debugextensions but rather fix bug with not-loading extensions.

marmoute accepted this revision.Sep 28 2020, 5:25 AM

ha, okay

This revision now requires review to proceed.Sep 28 2020, 5:25 AM
pulkit updated this revision to Diff 23256.Oct 16 2020, 4:02 AM
marmoute accepted this revision.Oct 16 2020, 6:26 AM
pulkit added a commit: rHGfd1de908f2b4: dispatch: load shared source repository config in share-safe mode.Oct 28 2020, 9:58 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGfd1de908f2b4: dispatch: load shared source repository config in share-safe mode (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (28 lines)
Mtests/test-share-safe.t (11 lines)

Diff 23336

mercurial/dispatch.py

demandimport, demandimport,
encoding, encoding,
error, error,
extensions, extensions,
fancyopts, fancyopts,
help, help,
hg, hg,
hook, hook,
localrepo,
profiling, profiling,
pycompat, pycompat,
rcutil, rcutil,
registrar, registrar,
requirements as requirementsmod,
scmutil, scmutil,
ui as uimod, ui as uimod,
util, util,
vfs,
) )
from .utils import ( from .utils import (
procutil, procutil,
stringutil, stringutil,
) )
args=b" ".join(fullargs), args=b" ".join(fullargs),
pats=cmdpats, pats=cmdpats,
opts=cmdoptions, opts=cmdoptions,
) )
raise raise
return ret return ret
def _readsharedsourceconfig(ui, path):
"""if the current repository is shared one, this tries to read
.hg/hgrc of shared source if we are in share-safe mode
Config read is loaded into the ui object passed
This should be called before reading .hg/hgrc or the main repo
as that overrides config set in shared source"""
try:
with open(os.path.join(path, b".hg", b"requires"), "rb") as fp:
requirements = set(fp.read().splitlines())
if not (
requirementsmod.SHARESAFE_REQUIREMENT in requirements
and requirementsmod.SHARED_REQUIREMENT in requirements
):
return
hgvfs = vfs.vfs(os.path.join(path, b".hg"))
sharedvfs = localrepo._getsharedvfs(hgvfs, requirements)
ui.readconfig(sharedvfs.join(b"hgrc"), path)
except IOError:
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."
""" """
if wd is None: if wd is None:
try: try:
wd = encoding.getcwd() wd = encoding.getcwd()
except OSError as e: except OSError as e:
raise error.Abort( raise error.Abort(
_(b"error getting current working directory: %s") _(b"error getting current working directory: %s")
% encoding.strtolocal(e.strerror) % encoding.strtolocal(e.strerror)
) )
path = cmdutil.findrepo(wd) or b"" path = cmdutil.findrepo(wd) or b""
if not path: if not path:
lui = ui lui = ui
else: else:
lui = ui.copy() lui = ui.copy()
if rcutil.use_repo_hgrc(): if rcutil.use_repo_hgrc():
_readsharedsourceconfig(lui, path)
lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
if rpath: if rpath:
path = lui.expandpath(rpath) path = lui.expandpath(rpath)
lui = ui.copy() lui = ui.copy()
if rcutil.use_repo_hgrc(): if rcutil.use_repo_hgrc():
_readsharedsourceconfig(lui, path)
lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
return path, lui return path, lui
def _checkshellalias(lui, ui, args): def _checkshellalias(lui, ui, args):
"""Return the function to run the shell alias, if it is required""" """Return the function to run the shell alias, if it is required"""
options = {} options = {}

tests/test-share-safe.t

$ echo "[extensions]" >> ../source/.hg/hgrc $ echo "[extensions]" >> ../source/.hg/hgrc
$ echo "extdiff=" >> ../source/.hg/hgrc $ echo "extdiff=" >> ../source/.hg/hgrc
$ hg debugextensions -R ../source $ hg debugextensions -R ../source
extdiff extdiff
share share
$ hg extdiff -R ../source -p echo $ hg extdiff -R ../source -p echo
BROKEN: the command below does not work but debugextensions says that extension BROKEN: the command below will not work if config of shared source is not loaded
on dispatch but debugextensions says that extension
marmouteUnsubmitted
Not Done

We shoulddrop the BROKEN:, should we not?

marmoute: We shoulddrop the `BROKEN:`, should we not?
pulkitAuthorUnsubmitted
Done

Nope. hg debugextensions is still broken as it shows list of extension according to config values specified and not according to ones which are loaded while running a command. The previous patch demonstrates that. This patch does not fix debugextensions but rather fix bug with not-loading extensions.

pulkit: Nope. `hg debugextensions` is still broken as it shows list of extension according to config…
is loaded is loaded
$ hg debugextensions $ hg debugextensions
extdiff extdiff
share share
BROKEN: extdiff command should work here
$ hg extdiff -p echo $ hg extdiff -p echo
hg: unknown command 'extdiff'
'extdiff' is provided by the following extension:
extdiff command to allow external programs to compare revisions
(use 'hg help extensions' for information on enabling extensions)
[255]
However, local .hg/hgrc should override the config set by share source However, local .hg/hgrc should override the config set by share source
$ echo "[ui]" >> .hg/hgrc $ echo "[ui]" >> .hg/hgrc
$ echo "curses=false" >> .hg/hgrc $ echo "curses=false" >> .hg/hgrc
$ hg showconfig ui.curses $ hg showconfig ui.curses
false false