This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10451

urlutil: move url "fixing" at the time of `ui.paths` initialization
ClosedPublic

Authored by marmoute on Apr 15 2021, 8:56 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa671832a8e41: urlutil: move url "fixing" at the time of `ui.paths` initialization
Summary

Doing such fixing at the time is simpler and will be necessary to deal with
urls list in a sane manner. It also reduce the size of fix-config which is
always better.

I wish we could get ride of the hackish way to pass the root around, I suspect
that the root variable could be stored as part of the config value, along side
the source. However getting to the end of this root business is a far too
large detours to make now.

The test change to tests/test-hgrc.t and test-config.t are expectied since
we are not longer altering the config itself, but the way it is interpreted when
building path. This seems more correct.

I also added a couple of test call to test-config.t and test-globalopts.t to
clarify that the expanding process is properly happening a the right time.

Diff Detail

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

Event Timeline

marmoute created this revision.Apr 15 2021, 8:56 PM
baymax updated this revision to Diff 27020.Apr 17 2021, 7:45 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Apr 29 2021, 9:37 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/ui.py
237

Is that "Hold"?

This revision is now accepted and ready to land.Apr 29 2021, 9:37 AM
baymax updated this revision to Diff 27211.Apr 29 2021, 1:47 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27239.Apr 30 2021, 8:26 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27423.May 3 2021, 9:53 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.May 15 2021, 3:17 PM
baymax updated this revision to Diff 27958.May 17 2021, 2:46 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (17 lines)
Mmercurial/utils/urlutil.py (11 lines)
Mtests/test-config.t (8 lines)
Mtests/test-globalopts.t (4 lines)
Mtests/test-hgrc.t (2 lines)

Diff 26960

mercurial/ui.py

self._reportuntrusted = True self._reportuntrusted = True
self._knownconfig = configitems.coreitems self._knownconfig = configitems.coreitems
self._ocfg = config.config() # overlay self._ocfg = config.config() # overlay
self._tcfg = config.config() # trusted self._tcfg = config.config() # trusted
self._ucfg = config.config() # untrusted self._ucfg = config.config() # untrusted
self._trustusers = set() self._trustusers = set()
self._trustgroups = set() self._trustgroups = set()
self.callhooks = True self.callhooks = True
# old the root to use for each [paths] entry
AlphareUnsubmitted
Not Done

Is that "Hold"?

Alphare: Is that "Hold"?
self._path_to_root = {}
# Insecure server connections requested. # Insecure server connections requested.
self.insecureconnections = False self.insecureconnections = False
# Blocked time # Blocked time
self.logblockedtimes = False self.logblockedtimes = False
# color mode: see mercurial/color.py for possible value # color mode: see mercurial/color.py for possible value
self._colormode = None self._colormode = None
self._terminfoparams = {} self._terminfoparams = {}
self._styles = {} self._styles = {}
self._tcfg = src._tcfg.copy() self._tcfg = src._tcfg.copy()
self._ucfg = src._ucfg.copy() self._ucfg = src._ucfg.copy()
self._ocfg = src._ocfg.copy() self._ocfg = src._ocfg.copy()
self._trustusers = src._trustusers.copy() self._trustusers = src._trustusers.copy()
self._trustgroups = src._trustgroups.copy() self._trustgroups = src._trustgroups.copy()
self.environ = src.environ self.environ = src.environ
self.callhooks = src.callhooks self.callhooks = src.callhooks
self._path_to_root = src._path_to_root
self.insecureconnections = src.insecureconnections self.insecureconnections = src.insecureconnections
self._colormode = src._colormode self._colormode = src._colormode
self._terminfoparams = src._terminfoparams.copy() self._terminfoparams = src._terminfoparams.copy()
self._styles = src._styles.copy() self._styles = src._styles.copy()
self.fixconfig() self.fixconfig()
self.httppasswordmgrdb = src.httppasswordmgrdb self.httppasswordmgrdb = src.httppasswordmgrdb
def fixconfig(self, root=None, section=None): def fixconfig(self, root=None, section=None):
if section in (None, b'paths'): if section in (None, b'paths'):
# expand vars and ~ # expand vars and ~
# translate paths relative to root (or home) into absolute paths # translate paths relative to root (or home) into absolute paths
root = root or encoding.getcwd() root = root or encoding.getcwd()
for c in self._tcfg, self._ucfg, self._ocfg: for c in self._tcfg, self._ucfg, self._ocfg:
for n, p in c.items(b'paths'): for n, p in c.items(b'paths'):
old_p = p
s = self.configsource(b'paths', n) or b'none'
root_key = (n, p, s)
if root_key not in self._path_to_root:
self._path_to_root[root_key] = root
# Ignore sub-options. # Ignore sub-options.
if b':' in n: if b':' in n:
continue continue
if not p: if not p:
continue continue
if b'%%' in p: if b'%%' in p:
s = self.configsource(b'paths', n) or b'none' if s is None:
s = 'none'
self.warn( self.warn(
_(b"(deprecated '%%' in path %s=%s from %s)\n") _(b"(deprecated '%%' in path %s=%s from %s)\n")
% (n, p, s) % (n, p, s)
) )
p = p.replace(b'%%', b'%') p = p.replace(b'%%', b'%')
p = util.expandpath(p) if p != old_p:
if not urlutil.hasscheme(p) and not os.path.isabs(p):
p = os.path.normpath(os.path.join(root, p))
c.alter(b"paths", n, p) c.alter(b"paths", n, p)
if section in (None, b'ui'): if section in (None, b'ui'):
# update ui options # update ui options
self._fmsgout, self._fmsgerr = _selectmsgdests(self) self._fmsgout, self._fmsgerr = _selectmsgdests(self)
self.debugflag = self.configbool(b'ui', b'debug') self.debugflag = self.configbool(b'ui', b'debug')
self.verbose = self.debugflag or self.configbool(b'ui', b'verbose') self.verbose = self.debugflag or self.configbool(b'ui', b'verbose')
self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet') self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet')
if self.verbose and self.quiet: if self.verbose and self.quiet:

mercurial/utils/urlutil.py

Data is initially derived from ui instances and the config files they have Data is initially derived from ui instances and the config files they have
loaded. loaded.
""" """
def __init__(self, ui): def __init__(self, ui):
dict.__init__(self) dict.__init__(self)
home_path = os.path.expanduser(b'~')
for name, loc in ui.configitems(b'paths', ignoresub=True): for name, loc in ui.configitems(b'paths', ignoresub=True):
# No location is the same as not existing. # No location is the same as not existing.
if not loc: if not loc:
continue continue
loc, sub_opts = ui.configsuboptions(b'paths', name) _value, sub_opts = ui.configsuboptions(b'paths', name)
s = ui.configsource(b'paths', name)
root_key = (name, loc, s)
root = ui._path_to_root.get(root_key, home_path)
loc = os.path.expandvars(loc)
loc = os.path.expanduser(loc)
if not hasscheme(loc) and not os.path.isabs(loc):
loc = os.path.normpath(os.path.join(root, loc))
self[name] = [path(ui, name, rawloc=loc, suboptions=sub_opts)] self[name] = [path(ui, name, rawloc=loc, suboptions=sub_opts)]
for name, old_paths in sorted(self.items()): for name, old_paths in sorted(self.items()):
new_paths = [] new_paths = []
for p in old_paths: for p in old_paths:
new_paths.extend(_chain_path(p, ui, self)) new_paths.extend(_chain_path(p, ui, self))
self[name] = new_paths self[name] = new_paths

tests/test-config.t

$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [paths] > [paths]
> foo = ~/foo > foo = ~/foo
> foo:suboption = ~/foo > foo:suboption = ~/foo
> EOF > EOF
$ hg showconfig paths $ hg showconfig paths
paths.foo=~/foo
paths.foo:suboption=~/foo paths.foo:suboption=~/foo
paths.foo=$TESTTMP/foo
note: The path expansion no longer happens at the config level, but the path is
still expanded:
$ hg path | grep foo
foo = $TESTTMP/foo
edit failure edit failure
$ HGEDITOR=false hg config --edit $ HGEDITOR=false hg config --edit
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[10] [10]
config affected by environment variables config affected by environment variables

tests/test-globalopts.t

#if no-rhg #if no-rhg
$ cd c $ cd c
$ hg -R default identify $ hg -R default identify
8580ff50825a tip 8580ff50825a tip
$ hg -R relative identify $ hg -R relative identify
8580ff50825a tip 8580ff50825a tip
$ echo '[paths]' >> $HGRCPATH $ echo '[paths]' >> $HGRCPATH
$ echo 'relativetohome = a' >> $HGRCPATH $ echo 'relativetohome = a' >> $HGRCPATH
$ hg path | grep relativetohome
relativetohome = $TESTTMP/a
$ HOME=`pwd`/../ hg path | grep relativetohome
relativetohome = $TESTTMP/a
$ HOME=`pwd`/../ hg -R relativetohome identify $ HOME=`pwd`/../ hg -R relativetohome identify
8580ff50825a tip 8580ff50825a tip
$ cd .. $ cd ..
#endif #endif
#if no-outer-repo #if no-outer-repo
Implicit -R: Implicit -R:

tests/test-hgrc.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [paths] > [paths]
> foo = bar > foo = bar
> EOF > EOF
$ hg showconfig --debug paths $ hg showconfig --debug paths
plain: True plain: True
read config from: $TESTTMP/hgrc read config from: $TESTTMP/hgrc
$TESTTMP/hgrc:17: paths.foo=$TESTTMP/bar $TESTTMP/hgrc:17: paths.foo=bar
Test we can skip the user configuration Test we can skip the user configuration
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [paths] > [paths]
> elephant = babar > elephant = babar
> EOF > EOF
$ hg path $ hg path