This is an archive of the discontinued Mercurial Phabricator instance.

Differential D615

directaccess: store the access level in the ui object in dispatch
AbandonedPublic

Authored by pulkit on Sep 2 2017, 1:39 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Summary

This will help us to look for the level whenever we need that.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 2 2017, 1:39 PM
quark requested changes to this revision.Sep 7 2017, 2:00 AM
quark added a subscriber: quark.

Setting ui config seems like an abuse of the config system. I think it'll be cleaner if feed the right "repo" object directly to the command function. i.e. By default commands get the "visible" repo: repo.filtered('visible') - see hg.repository. We can change that and add special filter - like repo.fitlered('visible-directaccess-warn'). So the repo object carries the information itself.

This revision now requires changes to proceed.Sep 7 2017, 2:00 AM
durham added a subscriber: durham.Sep 7 2017, 8:52 PM
durham added inline comments.
tests/test-basic.t
4

Any idea why the order changed? Same for below

pulkit abandoned this revision.Sep 13 2017, 2:57 PM

Revision Contents
Changeset List

Diff 1582

mercurial/dispatch.py

return commands.version_(ui) return commands.version_(ui)
if options['help']: if options['help']:
return commands.help_(ui, cmd, command=cmd is not None) return commands.help_(ui, cmd, command=cmd is not None)
elif not cmd: elif not cmd:
return commands.help_(ui, 'shortlist') return commands.help_(ui, 'shortlist')
repo = None repo = None
cmdpats = args[:] cmdpats = args[:]
hiddenlevel = func.hiddenlevel
for ui_ in uis:
ui_.setconfig('_internal', 'hiddenlevel', hiddenlevel,
'func.hiddenlevel')
if not func.norepo: if not func.norepo:
# use the repo from the request only if we don't have -R # use the repo from the request only if we don't have -R
if not rpath and not cwd: if not rpath and not cwd:
repo = req.repo repo = req.repo
if repo: if repo:
# set the descriptors of the repo ui to those of ui # set the descriptors of the repo ui to those of ui
repo.ui.fin = ui.fin repo.ui.fin = ui.fin

tests/test-basic.t

Create a repository: Create a repository:
$ hg config $ hg config
extensions.fsmonitor= (fsmonitor !)
durhamUnsubmitted
Not Done

Any idea why the order changed? Same for below

durham: Any idea why the order changed? Same for below
_internal.hiddenlevel=0
devel.all-warnings=true devel.all-warnings=true
devel.default-date=0 0 devel.default-date=0 0
extensions.fsmonitor= (fsmonitor !)
largefiles.usercache=$TESTTMP/.cache/largefiles (glob) largefiles.usercache=$TESTTMP/.cache/largefiles (glob)
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.promptecho=True ui.promptecho=True
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
$ hg init t $ hg init t

tests/test-commandserver.t

... # the cached repo local hgrc contains ui.foo=bar, so showconfig should ... # the cached repo local hgrc contains ui.foo=bar, so showconfig should
... # show it ... # show it
... runcommand(server, ['showconfig'], outfilter=sep) ... runcommand(server, ['showconfig'], outfilter=sep)
... ...
... # but not for this repo ... # but not for this repo
... runcommand(server, ['init', 'foo']) ... runcommand(server, ['init', 'foo'])
... runcommand(server, ['-R', 'foo', 'showconfig', 'ui', 'defaults']) ... runcommand(server, ['-R', 'foo', 'showconfig', 'ui', 'defaults'])
*** runcommand showconfig *** runcommand showconfig
extensions.fsmonitor= (fsmonitor !)
ui.usehttp2=true (?)
ui.usehttp2=true (?)
_internal.hiddenlevel=0
bundle.mainreporoot=$TESTTMP/repo bundle.mainreporoot=$TESTTMP/repo
devel.all-warnings=true devel.all-warnings=true
devel.default-date=0 0 devel.default-date=0 0
extensions.fsmonitor= (fsmonitor !)
largefiles.usercache=$TESTTMP/.cache/largefiles largefiles.usercache=$TESTTMP/.cache/largefiles
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.usehttp2=true (?)
ui.foo=bar ui.foo=bar
ui.nontty=true ui.nontty=true
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
*** runcommand init foo *** runcommand init foo
*** runcommand -R foo showconfig ui defaults *** runcommand -R foo showconfig ui defaults
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.usehttp2=true (?)
ui.nontty=true ui.nontty=true
$ rm -R foo $ rm -R foo
#if windows #if windows
$ PYTHONPATH="$TESTTMP/repo;$PYTHONPATH" $ PYTHONPATH="$TESTTMP/repo;$PYTHONPATH"
#else #else
$ PYTHONPATH="$TESTTMP/repo:$PYTHONPATH" $ PYTHONPATH="$TESTTMP/repo:$PYTHONPATH"

tests/test-hgrc.t

# my-clone = /home/jdoe/jdoes-clone # my-clone = /home/jdoe/jdoes-clone
[ui] [ui]
# name and email (local to this repository, optional), e.g. # name and email (local to this repository, optional), e.g.
# username = Jane Doe <jdoe@example.com> # username = Jane Doe <jdoe@example.com>
$ hg paths $ hg paths
default = $TESTTMP/foo%bar (glob) default = $TESTTMP/foo%bar (glob)
$ hg showconfig $ hg showconfig
_internal.hiddenlevel=0
bundle.mainreporoot=$TESTTMP/foobar (glob) bundle.mainreporoot=$TESTTMP/foobar (glob)
paths.default=$TESTTMP/foo%bar (glob) paths.default=$TESTTMP/foo%bar (glob)
$ cd .. $ cd ..
issue1829: wrong indentation issue1829: wrong indentation
$ echo '[foo]' > $HGRC $ echo '[foo]' > $HGRC
$ echo ' x = y' >> $HGRC $ echo ' x = y' >> $HGRC
Copyright (C) 2005-* Matt Mackall and others (glob) Copyright (C) 2005-* Matt Mackall and others (glob)
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
$ unset FAKEPATH $ unset FAKEPATH
make sure global options given on the cmdline take precedence make sure global options given on the cmdline take precedence
$ hg showconfig --config ui.verbose=True --quiet $ hg showconfig --config ui.verbose=True --quiet
_internal.hiddenlevel=0
bundle.mainreporoot=$TESTTMP bundle.mainreporoot=$TESTTMP
ui.verbose=False ui.verbose=False
ui.debug=False ui.debug=False
ui.quiet=True ui.quiet=True
$ touch foobar/untracked $ touch foobar/untracked
$ cat >> foobar/.hg/hgrc <<EOF $ cat >> foobar/.hg/hgrc <<EOF
> [ui] > [ui]
$ cd usertest $ cd usertest
$ touch bar $ touch bar
$ hg commit --addremove --quiet -m "added bar" $ hg commit --addremove --quiet -m "added bar"
$ hg log --template "{author}\n" $ hg log --template "{author}\n"
John Doe John Doe
$ cd .. $ cd ..
$ hg showconfig $ hg showconfig
_internal.hiddenlevel=0
bundle.mainreporoot=$TESTTMP bundle.mainreporoot=$TESTTMP
ui.username=$FAKEUSER ui.username=$FAKEUSER
$ unset FAKEUSER $ unset FAKEUSER
$ HGUSER=$olduser $ HGUSER=$olduser
$ export HGUSER $ export HGUSER
showconfig with multiple arguments showconfig with multiple arguments
$ echo "identify=-n" >> $HGRC $ echo "identify=-n" >> $HGRC
$ echo "[alias]" >> $HGRC $ echo "[alias]" >> $HGRC
$ echo "log=log -g" >> $HGRC $ echo "log=log -g" >> $HGRC
customized hgrc customized hgrc
$ hg showconfig $ hg showconfig
read config from: $TESTTMP/hgrc read config from: $TESTTMP/hgrc
func.hiddenlevel: _internal.hiddenlevel=0
$TESTTMP/hgrc:13: alias.log=log -g $TESTTMP/hgrc:13: alias.log=log -g
repo: bundle.mainreporoot=$TESTTMP repo: bundle.mainreporoot=$TESTTMP
$TESTTMP/hgrc:11: defaults.identify=-n $TESTTMP/hgrc:11: defaults.identify=-n
$TESTTMP/hgrc:2: ui.debug=true $TESTTMP/hgrc:2: ui.debug=true
$TESTTMP/hgrc:3: ui.fallbackencoding=ASCII $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
$TESTTMP/hgrc:4: ui.quiet=true $TESTTMP/hgrc:4: ui.quiet=true
$TESTTMP/hgrc:5: ui.slash=true $TESTTMP/hgrc:5: ui.slash=true
$TESTTMP/hgrc:6: ui.traceback=true $TESTTMP/hgrc:6: ui.traceback=true
$TESTTMP/hgrc:7: ui.verbose=true $TESTTMP/hgrc:7: ui.verbose=true
$TESTTMP/hgrc:8: ui.style=~/.hgstyle $TESTTMP/hgrc:8: ui.style=~/.hgstyle
$TESTTMP/hgrc:9: ui.logtemplate={node} $TESTTMP/hgrc:9: ui.logtemplate={node}
plain hgrc plain hgrc
$ HGPLAIN=; export HGPLAIN $ HGPLAIN=; export HGPLAIN
$ hg showconfig --config ui.traceback=True --debug $ hg showconfig --config ui.traceback=True --debug
read config from: $TESTTMP/hgrc read config from: $TESTTMP/hgrc
func.hiddenlevel: _internal.hiddenlevel=0
repo: bundle.mainreporoot=$TESTTMP repo: bundle.mainreporoot=$TESTTMP
--config: ui.traceback=True --config: ui.traceback=True
--verbose: ui.verbose=False --verbose: ui.verbose=False
--debug: ui.debug=True --debug: ui.debug=True
--quiet: ui.quiet=False --quiet: ui.quiet=False
with environment variables with environment variables
$ PAGER=p1 EDITOR=e1 VISUAL=e2 hg showconfig --debug $ PAGER=p1 EDITOR=e1 VISUAL=e2 hg showconfig --debug
set config by: $EDITOR set config by: $EDITOR
set config by: $VISUAL set config by: $VISUAL
set config by: $PAGER set config by: $PAGER
read config from: $TESTTMP/hgrc read config from: $TESTTMP/hgrc
func.hiddenlevel: _internal.hiddenlevel=0
repo: bundle.mainreporoot=$TESTTMP repo: bundle.mainreporoot=$TESTTMP
$PAGER: pager.pager=p1 $PAGER: pager.pager=p1
$VISUAL: ui.editor=e2 $VISUAL: ui.editor=e2
--verbose: ui.verbose=False --verbose: ui.verbose=False
--debug: ui.debug=True --debug: ui.debug=True
--quiet: ui.quiet=False --quiet: ui.quiet=False
plain mode with exceptions plain mode with exceptions
$ cat > plain.py <<EOF $ cat > plain.py <<EOF
> from mercurial import commands, extensions > from mercurial import commands, extensions
> def _config(orig, ui, repo, *values, **opts): > def _config(orig, ui, repo, *values, **opts):
> ui.write('plain: %r\n' % ui.plain()) > ui.write('plain: %r\n' % ui.plain())
> return orig(ui, repo, *values, **opts) > return orig(ui, repo, *values, **opts)
> def uisetup(ui): > def uisetup(ui):
> extensions.wrapcommand(commands.table, 'config', _config) > extensions.wrapcommand(commands.table, 'config', _config)
> EOF > EOF
$ echo "[extensions]" >> $HGRC $ echo "[extensions]" >> $HGRC
$ echo "plain=./plain.py" >> $HGRC $ echo "plain=./plain.py" >> $HGRC
$ HGPLAINEXCEPT=; export HGPLAINEXCEPT $ HGPLAINEXCEPT=; export HGPLAINEXCEPT
$ hg showconfig --config ui.traceback=True --debug $ hg showconfig --config ui.traceback=True --debug
plain: True plain: True
read config from: $TESTTMP/hgrc read config from: $TESTTMP/hgrc
func.hiddenlevel: _internal.hiddenlevel=0
repo: bundle.mainreporoot=$TESTTMP repo: bundle.mainreporoot=$TESTTMP
$TESTTMP/hgrc:15: extensions.plain=./plain.py $TESTTMP/hgrc:15: extensions.plain=./plain.py
--config: ui.traceback=True --config: ui.traceback=True
--verbose: ui.verbose=False --verbose: ui.verbose=False
--debug: ui.debug=True --debug: ui.debug=True
--quiet: ui.quiet=False --quiet: ui.quiet=False
$ unset HGPLAIN $ unset HGPLAIN
$ hg showconfig --config ui.traceback=True --debug $ hg showconfig --config ui.traceback=True --debug
plain: True plain: True
read config from: $TESTTMP/hgrc read config from: $TESTTMP/hgrc
func.hiddenlevel: _internal.hiddenlevel=0
repo: bundle.mainreporoot=$TESTTMP repo: bundle.mainreporoot=$TESTTMP
$TESTTMP/hgrc:15: extensions.plain=./plain.py $TESTTMP/hgrc:15: extensions.plain=./plain.py
--config: ui.traceback=True --config: ui.traceback=True
--verbose: ui.verbose=False --verbose: ui.verbose=False
--debug: ui.debug=True --debug: ui.debug=True
--quiet: ui.quiet=False --quiet: ui.quiet=False
$ HGPLAINEXCEPT=i18n; export HGPLAINEXCEPT $ HGPLAINEXCEPT=i18n; export HGPLAINEXCEPT
$ hg showconfig --config ui.traceback=True --debug $ hg showconfig --config ui.traceback=True --debug
plain: True plain: True
read config from: $TESTTMP/hgrc read config from: $TESTTMP/hgrc
func.hiddenlevel: _internal.hiddenlevel=0
repo: bundle.mainreporoot=$TESTTMP repo: bundle.mainreporoot=$TESTTMP
$TESTTMP/hgrc:15: extensions.plain=./plain.py $TESTTMP/hgrc:15: extensions.plain=./plain.py
--config: ui.traceback=True --config: ui.traceback=True
--verbose: ui.verbose=False --verbose: ui.verbose=False
--debug: ui.debug=True --debug: ui.debug=True
--quiet: ui.quiet=False --quiet: ui.quiet=False
source of paths is not mangled source of paths is not mangled