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

history: more import cleanups

Changeset b3c8a930435d…

Parent a9cae9a52e7a…

by Steve Borho

Changes to one file · Browse files at b3c8a930435d Showing diff from parent a9cae9a52e7a Diff from another changeset...

Change 1 of 9 Show Entire File hggtk/​history.py Stacked
 
11
12
13
14
15
 
16
17
18
19
20
21
22
23
24
 
25
26
27
 
31
32
33
34
 
35
36
37
 
252
253
254
255
 
256
257
258
 
279
280
281
282
 
283
284
285
 
328
329
330
331
 
332
333
334
 
478
479
480
481
 
482
483
484
 
503
504
505
506
 
507
508
509
 
603
604
605
606
 
607
608
609
 
610
611
612
 
618
619
620
621
 
622
623
624
 
11
12
13
 
 
14
15
16
17
18
 
19
20
21
 
22
23
24
25
 
29
30
31
 
32
33
34
35
 
250
251
252
 
253
254
255
256
 
277
278
279
 
280
281
282
283
 
326
327
328
 
329
330
331
332
 
476
477
478
 
479
480
481
482
 
501
502
503
 
504
505
506
507
 
601
602
603
 
604
605
606
 
607
608
609
610
 
616
617
618
 
619
620
621
622
@@ -11,17 +11,15 @@
 import pango  import StringIO   -from mercurial.node import * -from mercurial import ui, hg, commands, extensions +from mercurial import ui, hg, commands, extensions, util    from thgutil.i18n import _  from thgutil import hglib, paths   -from hggtk.gdialog import *  from hggtk.logview import treemodel  from hggtk.logview.treeview import TreeView as LogTreeView   -from hggtk import gtklib, hgcmd, datamine, logfilter +from hggtk import gdialog, gtklib, hgcmd, datamine, logfilter  from hggtk import backout, status, hgemail, tagadd, update, merge  from hggtk import changeset   @@ -31,7 +29,7 @@
  menuitem.set_border_width(1)   return menuitem   -class GLog(GDialog): +class GLog(gdialog.GDialog):   """GTK+ based dialog for displaying repository logs   """   def get_title(self): @@ -252,7 +250,7 @@
  return l or 500     def save_settings(self): - settings = GDialog.save_settings(self) + settings = gdialog.GDialog.save_settings(self)   settings['glog-vpane'] = self._vpaned.get_position()   settings['glog-hpane'] = self._hpaned.get_position()   for col in ('rev', 'date', 'id', 'branch'): @@ -279,7 +277,7 @@
  self.changeview.display(False)   self.changeview.glog_parent = self   - GDialog.load_settings(self, settings) + gdialog.GDialog.load_settings(self, settings)   self._setting_vpos = -1   self._setting_hpos = -1   self.showcol = {} @@ -328,7 +326,7 @@
  elif self._filter == "tagged":   tagged = []   for t, r in self.repo.tagslist(): - hr = hex(r) + hr = self.repo[r].rev()   if hr not in tagged:   tagged.insert(0, hr)   self.opts['revs'] = tagged @@ -478,7 +476,7 @@
    def _strip_rev(self, menuitem):   rev = self.currow[treemodel.REVID] - res = Confirm(_('Confirm Strip Revision(s)'), [], self, + res = gdialog.Confirm(_('Confirm Strip Revision(s)'), [], self,   _('Remove revision %d and all descendants?') % rev).run()   if res != gtk.RESPONSE_YES:   return @@ -503,7 +501,7 @@
    def _revert(self, menuitem):   rev = self.currow[treemodel.REVID] - res = Confirm(_('Confirm Revert Revision(s)'), [], self, + res = gdialog.Confirm(_('Confirm Revert Revision(s)'), [], self,   _('Revert all files to revision %d?\nThis will overwrite your '   'local changes') % rev).run()   @@ -603,10 +601,10 @@
    def _copy_hash(self, menuitem):   rev = self.currow[treemodel.REVID] - node = self.repo[rev].node() + node = str(self.repo[rev])   sel = (os.name == 'nt') and 'CLIPBOARD' or 'PRIMARY'   clipboard = gtk.Clipboard(selection=sel) - clipboard.set_text(hex(node)) + clipboard.set_text(node)     def _export_patch(self, menuitem):   rev = self.currow[treemodel.REVID] @@ -618,7 +616,7 @@
    if result:   if os.path.exists(result): - res = Confirm(_('Confirm Overwrite'), [], self, + res = gdialog.Confirm(_('Confirm Overwrite'), [], self,   _('The file "%s" already exists!\n\n'   'Do you want to overwrite it?') % result).run()   if res != gtk.RESPONSE_YES: