Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

settings: use 'None' to indicate unspecified value

Changeset 8fea859e9f16…

Parent fb7dd75e314b…

by Steve Borho

Changes to one file · Browse files at 8fea859e9f16 Showing diff from parent fb7dd75e314b Diff from another changeset...

Change 1 of 8 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
36
37
38
39
 
40
41
42
 
50
51
52
53
 
54
55
56
 
69
70
71
72
 
73
74
75
 
95
96
97
98
 
99
100
101
 
113
114
115
116
 
117
118
119
 
132
133
134
135
 
136
137
138
 
681
682
683
684
 
685
686
687
 
733
734
735
736
 
737
738
739
 
36
37
38
 
39
40
41
42
 
50
51
52
 
53
54
55
56
 
69
70
71
 
72
73
74
75
 
95
96
97
 
98
99
100
101
 
113
114
115
 
116
117
118
119
 
132
133
134
 
135
136
137
138
 
681
682
683
 
684
685
686
687
 
733
734
735
 
736
737
738
739
@@ -36,7 +36,7 @@
  self.setEditable(opts.get('canedit', False))   self.setValidator(opts.get('validator', None))   self.defaults = opts.get('defaults', []) - self.curvalue = False + self.curvalue = None   self.loaded = False   if 'nohist' in opts:   self.previous = [] @@ -50,7 +50,7 @@
  self.clear()   ucur = hglib.tounicode(self.curvalue or '')   if self.opts.get('defer') and not self.loaded: - if self.curvalue == False: # unspecified + if self.curvalue == None: # unspecified   self.addItem(_unspecstr)   else:   self.addItem(ucur or '...') @@ -69,7 +69,7 @@
  self.addItem(m)   if curindex is not None:   self.setCurrentIndex(curindex) - elif self.curvalue == False: + elif self.curvalue is None:   self.setCurrentIndex(0)   elif self.curvalue:   self.addItem(ucur) @@ -95,7 +95,7 @@
  def value(self):   utext = self.currentText()   if utext == _unspecstr: - return False + return None   if 'nohist' in self.opts or utext in self.defaults + self.previous:   return hglib.fromunicode(utext)   print 'saving', self.opts['cpath'], utext @@ -113,7 +113,7 @@
  def __init__(self, parent=None, **opts):   QLineEdit.__init__(self, parent)   self.opts = opts - self.curvalue = False + self.curvalue = None   self.setEchoMode(QLineEdit.Password)   self.setDisabled(opts['readonly'])   @@ -132,7 +132,7 @@
    def value(self):   utext = self.text() - return utext and hglib.fromunicode(utext) or False + return utext and hglib.fromunicode(utext) or None     def isDirty(self):   return self.value() != self.curvalue @@ -681,7 +681,7 @@
  section, key = cpath.split('.', 1)   return self.ini[section][key]   except KeyError: - return False + return None     def loadIniFile(self, rcpath):   for fn in rcpath: @@ -733,7 +733,7 @@
  def recordNewValue(self, cpath, newvalue):   # 'newvalue' is in local encoding   section, key = cpath.split('.', 1) - if newvalue == False: + if newvalue == None:   try:   del self.ini[section][key]   except KeyError: