Changeset 63f0a1cc9b38…
Parent 047d5d27fff8…
by
Changes to one file · Browse files at 63f0a1cc9b38 Showing diff from parent 047d5d27fff8 Diff from another changeset...
@@ -223,23 +223,28 @@
def get_graphlimit(self, suggestion):
limit_opt = self.repo.ui.config('tortoisehg', 'graphlimit', '500')
- limit_opt = suggestion or limit_opt
- try:
- limit = int(limit_opt)
- except ValueError:
- return 0
- if limit <= 0:
- return 0
- return limit
+ l = 0
+ for limit in (suggestion, limit_opt):
+ try:
+ l = int(limit)
+ if l > 0:
+ return l
+ except (TypeError, ValueError), e:
+ pass
+ return l or 500
def load_settings(self, settings):
'''Called at beginning of display() method'''
+ self.stbar = gtklib.StatusBar()
+ self.limit = self.get_graphlimit(None)
+
# Allocate TreeView instance to use internally
- self.limit = self.get_graphlimit(self.opts['limit'])
- self.stbar = gtklib.StatusBar()
- self.graphview = TreeView(self.repo, self.limit, self.stbar)
- self.limit = self.get_graphlimit(None)
+ if 'limit' in self.opts:
+ firstlimit = self.get_graphlimit(self.opts['limit'])
+ self.graphview = TreeView(self.repo, firstlimit, self.stbar)
+ else:
+ self.graphview = TreeView(self.repo, self.limit, self.stbar)
# Allocate ChangeSet instance to use internally
self.changeview = ChangeSet(self.ui, self.repo, self.cwd, [],
|
Loading...