mercurial/ui.py
changeset 1637 3b1b44b917f4
parent 1609 c50bddfbc812
child 1837 6f67a4c93493
child 1839 876e4e6ad82b
child 1903 e4abeafd6eb1
equal deleted inserted replaced
1636:7da32bb3d1d3 1637:3b1b44b917f4
    21         self.verbose = self.configbool("ui", "verbose")
    21         self.verbose = self.configbool("ui", "verbose")
    22         self.debugflag = self.configbool("ui", "debug")
    22         self.debugflag = self.configbool("ui", "debug")
    23         self.interactive = self.configbool("ui", "interactive", True)
    23         self.interactive = self.configbool("ui", "interactive", True)
    24 
    24 
    25         self.updateopts(verbose, debug, quiet, interactive)
    25         self.updateopts(verbose, debug, quiet, interactive)
       
    26         self.diffcache = None
    26 
    27 
    27     def updateopts(self, verbose=False, debug=False, quiet=False,
    28     def updateopts(self, verbose=False, debug=False, quiet=False,
    28                  interactive=True):
    29                  interactive=True):
    29         self.quiet = (self.quiet or quiet) and not verbose and not debug
    30         self.quiet = (self.quiet or quiet) and not verbose and not debug
    30         self.verbose = (self.verbose or verbose) or debug
    31         self.verbose = (self.verbose or verbose) or debug
    73                 yield section, name, value.replace('\n', '\\n')
    74                 yield section, name, value.replace('\n', '\\n')
    74                 seen[section, name] = 1
    75                 seen[section, name] = 1
    75 
    76 
    76     def extensions(self):
    77     def extensions(self):
    77         return self.configitems("extensions")
    78         return self.configitems("extensions")
       
    79 
       
    80     def diffopts(self):
       
    81         if self.diffcache:
       
    82             return self.diffcache
       
    83         ret = { 'showfunc' : True, 'ignorews' : False}
       
    84         for x in self.configitems("diff"):
       
    85             k = x[0].lower()
       
    86             v = x[1]
       
    87             if v:
       
    88                 v = v.lower()
       
    89                 if v == 'true':
       
    90                     value = True
       
    91                 else:
       
    92                     value = False
       
    93                 ret[k] = value
       
    94         self.diffcache = ret
       
    95         return ret
    78 
    96 
    79     def username(self):
    97     def username(self):
    80         return (os.environ.get("HGUSER") or
    98         return (os.environ.get("HGUSER") or
    81                 self.config("ui", "username") or
    99                 self.config("ui", "username") or
    82                 os.environ.get("EMAIL") or
   100                 os.environ.get("EMAIL") or