Mercurial > hg > mercurial-crew

changeset 13493:95b0d4c1c9e1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: always report untrusted hgrc files when debug enabled It was suggested in IRC that people disabling the reporting of unstructed hgrc files can masquerade as problems. This makes sure untrusted hgrc files are always reported if --debug is used.
author Ry4an Brase <ry4an-hg@ry4an.org>
date Fri, 25 Feb 2011 23:26:24 -0600
parents ca940d06bf95
children 3178aca36b0f cf9303aa3bc2
files mercurial/ui.py tests/test-trusted.py tests/test-trusted.py.out
diffstat 3 files changed, 30 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -122,8 +122,8 @@
             self.quiet = not self.debugflag and self.configbool('ui', 'quiet')
             if self.verbose and self.quiet:
                 self.quiet = self.verbose = False
-            self._reportuntrusted = self.configbool("ui", "report_untrusted",
-                                        True)
+            self._reportuntrusted = self.debugflag or self.configbool("ui",
+                "report_untrusted", True)
             self.tracebackflag = self.configbool('ui', 'traceback', False)
 
         if section in (None, 'trusted'):
--- a/tests/test-trusted.py
+++ b/tests/test-trusted.py
@@ -11,7 +11,8 @@
 f.close()
 
 def testui(user='foo', group='bar', tusers=(), tgroups=(),
-           cuser='foo', cgroup='bar', debug=False, silent=False):
+           cuser='foo', cgroup='bar', debug=False, silent=False,
+           report=True):
     # user, group => owners of the file
     # tusers, tgroups => trusted users/groups
     # cuser, cgroup => user/group of the current process
@@ -61,6 +62,7 @@
 
     u = ui.ui()
     u.setconfig('ui', 'debug', str(bool(debug)))
+    u.setconfig('ui', 'report_untrusted', str(bool(report)))
     u.readconfig('.hg/hgrc')
     if silent:
         return u
@@ -131,6 +133,12 @@
 print "# prints debug warnings"
 u = testui(user='abc', group='def', cuser='foo', debug=True)
 
+print "# report_untrusted enabled without debug hides warnings"
+u = testui(user='abc', group='def', cuser='foo', report=False)
+
+print "# report_untrusted enabled with debug shows warnings"
+u = testui(user='abc', group='def', cuser='foo', debug=True, report=False)
+
 print "# ui.readconfig sections"
 filename = 'foobar'
 f = open(filename, 'w')
--- a/tests/test-trusted.py.out
+++ b/tests/test-trusted.py.out
@@ -136,6 +136,25 @@
 .ignoring untrusted configuration option paths.local = /another/path
 . local = /another/path
 
+# report_untrusted enabled without debug hides warnings
+# different user, different group
+trusted
+    global = /some/path
+untrusted
+. . global = /some/path
+. . local = /another/path
+
+# report_untrusted enabled with debug shows warnings
+# different user, different group
+Not trusting file .hg/hgrc from untrusted user abc, group def
+trusted
+ignoring untrusted configuration option paths.local = /another/path
+    global = /some/path
+untrusted
+. . global = /some/path
+.ignoring untrusted configuration option paths.local = /another/path
+. local = /another/path
+
 # ui.readconfig sections
 quux