diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -843,6 +843,10 @@ repo = None cmdpats = args[:] + hiddenlevel = func.hiddenlevel + for ui_ in uis: + ui_.setconfig('_internal', 'hiddenlevel', hiddenlevel, + 'func.hiddenlevel') if not func.norepo: # use the repo from the request only if we don't have -R if not rpath and not cwd: diff --git a/tests/test-basic.t b/tests/test-basic.t --- a/tests/test-basic.t +++ b/tests/test-basic.t @@ -1,9 +1,10 @@ Create a repository: $ hg config + extensions.fsmonitor= (fsmonitor !) + _internal.hiddenlevel=0 devel.all-warnings=true devel.default-date=0 0 - extensions.fsmonitor= (fsmonitor !) largefiles.usercache=$TESTTMP/.cache/largefiles (glob) ui.slash=True ui.interactive=False diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t --- a/tests/test-commandserver.t +++ b/tests/test-commandserver.t @@ -188,15 +188,17 @@ ... runcommand(server, ['init', 'foo']) ... runcommand(server, ['-R', 'foo', 'showconfig', 'ui', 'defaults']) *** runcommand showconfig + extensions.fsmonitor= (fsmonitor !) + ui.usehttp2=true (?) + ui.usehttp2=true (?) + _internal.hiddenlevel=0 bundle.mainreporoot=$TESTTMP/repo devel.all-warnings=true devel.default-date=0 0 - extensions.fsmonitor= (fsmonitor !) largefiles.usercache=$TESTTMP/.cache/largefiles ui.slash=True ui.interactive=False ui.mergemarkers=detailed - ui.usehttp2=true (?) ui.foo=bar ui.nontty=true web.address=localhost @@ -206,7 +208,6 @@ ui.slash=True ui.interactive=False ui.mergemarkers=detailed - ui.usehttp2=true (?) ui.nontty=true $ rm -R foo diff --git a/tests/test-hgrc.t b/tests/test-hgrc.t --- a/tests/test-hgrc.t +++ b/tests/test-hgrc.t @@ -45,6 +45,7 @@ $ hg paths default = $TESTTMP/foo%bar (glob) $ hg showconfig + _internal.hiddenlevel=0 bundle.mainreporoot=$TESTTMP/foobar (glob) paths.default=$TESTTMP/foo%bar (glob) $ cd .. @@ -79,6 +80,7 @@ make sure global options given on the cmdline take precedence $ hg showconfig --config ui.verbose=True --quiet + _internal.hiddenlevel=0 bundle.mainreporoot=$TESTTMP ui.verbose=False ui.debug=False @@ -110,6 +112,7 @@ $ cd .. $ hg showconfig + _internal.hiddenlevel=0 bundle.mainreporoot=$TESTTMP ui.username=$FAKEUSER @@ -153,6 +156,7 @@ $ hg showconfig read config from: $TESTTMP/hgrc + func.hiddenlevel: _internal.hiddenlevel=0 $TESTTMP/hgrc:13: alias.log=log -g repo: bundle.mainreporoot=$TESTTMP $TESTTMP/hgrc:11: defaults.identify=-n @@ -170,6 +174,7 @@ $ HGPLAIN=; export HGPLAIN $ hg showconfig --config ui.traceback=True --debug read config from: $TESTTMP/hgrc + func.hiddenlevel: _internal.hiddenlevel=0 repo: bundle.mainreporoot=$TESTTMP --config: ui.traceback=True --verbose: ui.verbose=False @@ -183,6 +188,7 @@ set config by: $VISUAL set config by: $PAGER read config from: $TESTTMP/hgrc + func.hiddenlevel: _internal.hiddenlevel=0 repo: bundle.mainreporoot=$TESTTMP $PAGER: pager.pager=p1 $VISUAL: ui.editor=e2 @@ -206,6 +212,7 @@ $ hg showconfig --config ui.traceback=True --debug plain: True read config from: $TESTTMP/hgrc + func.hiddenlevel: _internal.hiddenlevel=0 repo: bundle.mainreporoot=$TESTTMP $TESTTMP/hgrc:15: extensions.plain=./plain.py --config: ui.traceback=True @@ -216,6 +223,7 @@ $ hg showconfig --config ui.traceback=True --debug plain: True read config from: $TESTTMP/hgrc + func.hiddenlevel: _internal.hiddenlevel=0 repo: bundle.mainreporoot=$TESTTMP $TESTTMP/hgrc:15: extensions.plain=./plain.py --config: ui.traceback=True @@ -226,6 +234,7 @@ $ hg showconfig --config ui.traceback=True --debug plain: True read config from: $TESTTMP/hgrc + func.hiddenlevel: _internal.hiddenlevel=0 repo: bundle.mainreporoot=$TESTTMP $TESTTMP/hgrc:15: extensions.plain=./plain.py --config: ui.traceback=True