# HG changeset patch
# User Ry4an Brase <ry4an-hg@ry4an.org>
# Date 1298697984 21600
# Node ID 95b0d4c1c9e188d11f246d5a10f5ad36256103db
# Parent  ca940d06bf95e929eabdf68633ddbde68b093a0f
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.

diff -r ca940d06bf95 -r 95b0d4c1c9e1 mercurial/ui.py
--- a/mercurial/ui.py	Thu Feb 24 13:57:52 2011 -0300
+++ b/mercurial/ui.py	Fri Feb 25 23:26:24 2011 -0600
@@ -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'):
diff -r ca940d06bf95 -r 95b0d4c1c9e1 tests/test-trusted.py
--- a/tests/test-trusted.py	Thu Feb 24 13:57:52 2011 -0300
+++ b/tests/test-trusted.py	Fri Feb 25 23:26:24 2011 -0600
@@ -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')
diff -r ca940d06bf95 -r 95b0d4c1c9e1 tests/test-trusted.py.out
--- a/tests/test-trusted.py.out	Thu Feb 24 13:57:52 2011 -0300
+++ b/tests/test-trusted.py.out	Fri Feb 25 23:26:24 2011 -0600
@@ -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