Mercurial > hg

changeset 8200:865d2c646f29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: assumetrusted -> trust
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Apr 2009 16:50:44 -0500
parents e9f90e5989d9
children 7cf2b987acd3
files mercurial/ui.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/ui.py	Sun Apr 26 16:50:44 2009 -0500
+++ b/mercurial/ui.py	Sun Apr 26 16:50:44 2009 -0500
@@ -33,7 +33,7 @@
         else:
             # we always trust global config files
             for f in util.rcpath():
-                self.readconfig(f, assumetrusted=True)
+                self.readconfig(f, trust=True)
     def copy(self):
         return ui(self)
 
@@ -69,7 +69,7 @@
                         'user %s, group %s\n') % (f, user, group))
         return False
 
-    def readconfig(self, filename, root=None, assumetrusted=False,
+    def readconfig(self, filename, root=None, trust=False,
                    sections = None):
         try:
             fp = open(filename)
@@ -79,7 +79,7 @@
             raise
 
         cdata = config.config()
-        trusted = sections or assumetrusted or self._is_trusted(fp, filename)
+        trusted = sections or trust or self._is_trusted(fp, filename)
 
         try:
             cdata.read(filename, fp, sections=sections)