Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

history: clean up initial argument parsing

Changeset 04344695bedb…

Parent ae645a334509…

by Steve Borho

Changes to one file · Browse files at 04344695bedb Showing diff from parent ae645a334509 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​history.py Stacked
 
229
230
231
232
233
234
 
 
235
236
237
238
239
240
241
242
243
 
 
 
 
 
 
 
 
244
245
246
 
 
 
247
248
249
250
251
252
253
254
255
256
257
 
 
 
258
259
260
 
280
281
282
 
 
 
283
284
285
286
287
 
288
289
290
 
229
230
231
 
 
 
232
233
234
 
235
236
237
238
 
 
 
239
240
241
242
243
244
245
246
247
 
 
248
249
250
251
 
 
 
 
 
 
 
 
 
 
252
253
254
255
256
257
 
277
278
279
280
281
282
283
284
285
286
 
287
288
289
290
@@ -229,32 +229,29 @@
  def prepare_display(self):   'Called at end of display() method'   self.ready = True - self.opts['rev'] = [] # This option is dangerous - used directly by hg - self.opts['revs'] = None - os.chdir(self.repo.root) # for paths relative to repo root + root = self.repo.root + os.chdir(root) # for paths relative to repo root   - self.graphview.set_property('original-tip-revision', self.origtip)   if self.opts.get('orig-tip') is not None:   origtip = self.opts['orig-tip']   if origtip != len(self.repo):   self.origtip = origtip - self.graphview.set_property('original-tip-revision', origtip) - self.newbutton.set_active(True) - elif self.opts.get('filehist') is not None: + self.graphview.set_property('original-tip-revision', self.origtip) + + # ignore file patterns that imply repo root + if len(self.pats) == 1 and self.pats[0] in (root, root+os.sep, ''): + self.pats = [] + + opts = self.opts + if self.opts.get('filehist'):   self.custombutton.set_active(True) - self.reload_log(pats = [self.opts['filehist']]) - elif 'revrange' in self.opts: + self.filter = 'custom' + opts['pats'] = [opts['filehist']] + elif self.pats:   self.custombutton.set_active(True) - self.graphview.refresh(True, None, self.opts) - elif not self.pats: - self.reload_log() - elif len(self.pats) == 1 and \ - self.pats[0] in (self.repo.root, self.repo.root+os.sep, ''): - self.pats = [] - self.reload_log() - else: - self.custombutton.set_active(True) - self.reload_log(pats = self.pats) + self.filter = 'custom' + opts['pats'] = self.pats + self.reload_log(**opts)     def get_graphlimit(self, suggestion):   limit_opt = self.repo.ui.config('tortoisehg', 'graphlimit', '500') @@ -280,11 +277,14 @@
    def load_settings(self, settings):   'Called at beginning of display() method' + + # This stuff is here in load_settings in order to have access to + # self.changeview when building the toolbar. TODO: clean this up   self.stbar = gtklib.StatusBar()   self.limit = self.get_graphlimit(None)     # Allocate TreeView instance to use internally - if 'limit' in self.opts: + if self.opts['limit']:   firstlimit = self.get_graphlimit(self.opts['limit'])   self.graphview = LogTreeView(self.repo, firstlimit, self.stbar)   else: