facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity

rage: report the full config

Browse Source 
Summary:
This largely reverts the changes in D9443604, to make `hg rage` report the
full configs again.

Our configs vary from tier to tier and repository to repository.  The override
settings alone don't seem like enough to try and figure out what the actual
settings are that the user is using.

I retained the behavior of reporting the source file and line number for each
config item, which wasn't present before D9443604.  I also still excluded
config values from the "builtin" config source.  Currently this only excludes
the handful of merge-tools defined in
`eden/scm/edenscmnative/bindings/modules/pyconfigparser/src/lib.rs`

Reviewed By: quark-zju

Differential Revision: D20927599

fbshipit-source-id: 8b5b5bf8b7871b85bd0fe5cd179f16693e4fbb2a
This commit is contained in:
Adam Simpkins 2020-04-09 14:11:03 -07:00 committed by Facebook GitHub Bot
parent 921fc702ee
commit e8fea00489
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eden/scm/edenscm/hgext/rage.py
View File

@ -121,11 +121,11 @@ def localconfig(ui):
return result return result
def overriddenconfig(ui): def allconfig(ui):
result = [] result = []
for section, name, value in ui.walkconfig(): for section, name, value in ui.walkconfig():
source = ui.configsource(section, name) source = ui.configsource(section, name)
if source.find("overrides") > -1: if source.find("builtin") == -1:
result.append("%s.%s=%s # %s" % (section, name, value, source)) result.append("%s.%s=%s # %s" % (section, name, value, source))
return result return result
@ -371,7 +371,7 @@ def _makerage(ui, repo, **opts):
("scm daemon logs", lambda: scmdaemonlog(ui, repo)), ("scm daemon logs", lambda: scmdaemonlog(ui, repo)),
("debugstatus", lambda: hgcmd("debugstatus")), ("debugstatus", lambda: hgcmd("debugstatus")),
("debugtree", lambda: hgcmd("debugtree")), ("debugtree", lambda: hgcmd("debugtree")),
("hg config (overrides)", lambda: "\n".join(overriddenconfig(ui))), ("hg config (all)", lambda: "\n".join(allconfig(ui))),
("edenfs rage", lambda: shcmd("edenfsctl rage --stdout")), ("edenfs rage", lambda: shcmd("edenfsctl rage --stdout")),
( (
"environment variables", "environment variables",