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

stable hgtk: fix all other external callers of GLog

Changeset c2170a870803…

Parent cc54fcf69e20…

by Steve Borho

Changes to 5 files · Browse files at c2170a870803 Showing diff from parent cc54fcf69e20 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​changeset.py Stacked
 
545
546
547
548
 
549
550
551
552
553
 
 
554
555
556
 
545
546
547
 
548
549
 
 
 
 
550
551
552
553
554
@@ -545,12 +545,10 @@
  self.glog_parent.custombutton.set_active(True)   self.glog_parent.reload_log(**opts)   else: - # Else launch our own GLog instance + # Else launch our own glog instance   from hggtk import history - dialog = history.GLog(self.ui, self.repo, self.cwd, - [self.repo.root], {}) - dialog.open_with_file(self.curfile) - dialog.display() + dlg = history.run(self.ui, filehist=self.curfile) + dlg.display()     def revert_file(self, menuitem):   'User selected file revert from the file list context menu'
Change 1 of 1 Show Entire File hggtk/​datamine.py Stacked
 
151
152
153
154
155
 
156
157
158
 
151
152
153
 
 
154
155
156
157
@@ -151,8 +151,7 @@
    def cmenu_file_log(self, menuitem):   from hggtk import history - dlg = history.GLog(self.ui, self.repo, self.cwd, [self.repo.root], {}) - dlg.open_with_file(self.curpath) + dlg = history.run(self.ui, filehist=self.curpath)   dlg.display()     def grep_button_release(self, widget, event):
Change 1 of 3 Show Entire File hggtk/​history.py Stacked
 
240
241
242
243
244
245
246
247
248
249
 
260
261
262
263
 
264
265
266
 
828
829
830
831
 
832
833
834
 
240
241
242
 
 
 
 
243
244
245
 
256
257
258
 
259
260
261
262
 
824
825
826
 
827
828
829
830
@@ -240,10 +240,6 @@
  menu.show_all()   return menu   - def open_with_file(self, file): - 'Call this before display() to open with file history' - self.opts['filehist'] = file -   def prepare_display(self):   'Called at end of display() method'   self.opts['rev'] = [] # This option is dangerous - used directly by hg @@ -260,7 +256,7 @@
  self.origtip = origtip   self.graphview.set_property('original-tip-revision', origtip)   self.newbutton.set_active(True) - elif 'filehist' in self.opts: + elif self.opts.get('filehist') is not None:   self.custombutton.set_active(True)   self.reload_log(pats = [self.opts['filehist']])   elif 'revrange' in self.opts: @@ -828,7 +824,7 @@
  'limit':0, 'rev':[], 'removed':False, 'no_merges':False,   'date':None, 'only_merges':None, 'prune':[], 'git':False,   'verbose':False, 'include':[], 'exclude':[], 'from-synch':False, - 'orig-tip':None + 'orig-tip':None, 'filehist':None   }   cmdoptions.update(opts)   pats = hglib.canonpaths(pats)
Change 1 of 1 Show Entire File hggtk/​logview/​treeview.py Stacked
 
139
140
141
142
 
143
144
145
 
139
140
141
 
142
143
144
145
@@ -139,7 +139,7 @@
  self.grapher = None   return   - if 'filehist' in opts: + if opts.get('filehist') is not None:   self.grapher = filelog_grapher(self.repo, opts['filehist'])   elif graphcol:   end = 0
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
1094
1095
1096
1097
 
1098
1099
1100
 
1094
1095
1096
 
1097
1098
1099
1100
@@ -1094,7 +1094,7 @@
  def log_file(self, stat, wfile):   # Might want to include 'rev' here... trying without   from hggtk import history - dlg = history.GLog(self.ui, self.repo, self.cwd, [wfile], self.opts) + dlg = history.run(self.ui, wfile, **self.opts)   dlg.display()   return True