Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc1, 0.4rc2, and 0.4rc3

hggtk/history: cleanup startup logic

If started with a file pattern from the context menu, set 'custom filter' mode so
the user can get back to the full history. Remove filter info from title-bar, since
the passed in filter should not be persistent.

Changeset 921e26af0027…

Parent a0f9cb1f98c6…

by Steve Borho

Changes to one file · Browse files at 921e26af0027 Showing diff from parent a0f9cb1f98c6 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​history.py Stacked
 
29
30
31
32
33
34
35
36
37
38
39
 
40
41
42
 
188
189
190
191
 
192
193
194
195
196
197
198
199
200
 
 
 
201
202
203
204
 
 
205
206
 
 
 
 
 
 
 
207
208
209
210
211
 
271
272
273
274
275
276
277
278
279
 
280
281
282
 
29
30
31
 
 
 
 
 
 
 
 
32
33
34
35
 
181
182
183
 
184
185
186
187
188
189
190
 
 
 
191
192
193
194
195
 
 
196
197
198
 
199
200
201
202
203
204
205
206
 
207
208
209
 
269
270
271
 
 
 
 
 
 
272
273
274
275
@@ -29,14 +29,7 @@
  """GTK+ based dialog for displaying repository logs   """   def get_title(self): - title = os.path.basename(self.repo.root) + ' log ' - if 'rev' in self.opts and self.opts['rev']: - title += '--rev ' + ':'.join(self.opts['rev']) - if not self.pats or self.pats == ['']: - return title - if len(self.pats) > 1 or not os.path.isdir(self.pats[0]): - title += '{search} ' + ' '.join(self.pats) - return title + return os.path.basename(self.repo.root) + ' log'     def get_icon(self):   return 'menulog.ico' @@ -188,24 +181,29 @@
    def open_with_file(self, file):   '''Call this before display() to open with file history''' - self.curfile = file + self.opts['filehist'] = file     def prepare_display(self):   '''Called at end of display() method'''   self._last_rev = None   self._filter = "all"   self.currow = None - if self.pats == [self.repo.root] or self.pats == ['']: - self.pats = [] - if 'revrange' in self.opts: + self.curfile = None + + if 'filehist' in self.opts:   self.custombutton.set_active(True)   self.graphview.refresh(True, None, self.opts) - elif hasattr(self, 'curfile'): - opts = {'filehist' : self.curfile} + del self.opts['filehist'] + elif 'revrange' in self.opts:   self.custombutton.set_active(True) - self.graphview.refresh(True, None, opts) + self.graphview.refresh(True, None, self.opts) + elif self.pats == [self.repo.root] or self.pats == ['']: + self.pats = [] + self.reload_log() + elif self.pats: + self.custombutton.set_active(True) + self.graphview.refresh(False, self.pats, self.opts)   else: - self.curfile = None   self.reload_log()     def save_settings(self): @@ -271,12 +269,7 @@
  filter = filteropts.get('pats', [])   self.graphview.refresh(False, filter, self.opts)   elif self._filter == "all": - if not self.pats: - self.graphview.refresh(True, None, self.opts) - elif len(self.pats) > 1 or not os.path.isdir(self.pats[0]): - self.graphview.refresh(False, self.pats, self.opts) - else: - self.graphview.refresh(True, None, self.opts) + self.graphview.refresh(True, None, self.opts)   elif self._filter == "only_merges":   self.opts['only_merges'] = True   self.graphview.refresh(False, [], self.opts)