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

hggtk: fix circular dependencies

allow hgtk to work when extensions disable demandimport

Changeset bc45f929b187…

Parent c67e5d38717c…

by Steve Borho

Changes to 5 files · Browse files at bc45f929b187 Showing diff from parent c67e5d38717c Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​changeset.py Stacked
 
18
19
20
21
 
22
23
24
 
697
698
699
 
700
701
702
 
712
713
714
 
715
716
717
 
18
19
20
 
21
22
23
24
 
697
698
699
700
701
702
703
 
713
714
715
716
717
718
719
@@ -18,7 +18,7 @@
 from thgutil import shlib    from hggtk.gdialog import GDialog, Confirm, NativeSaveFileDialogWrapper -from hggtk import gtklib, hgcmd, datamine, history +from hggtk import gtklib, hgcmd    class ChangeSet(GDialog):   """GTK+ based dialog for displaying repository logs @@ -697,6 +697,7 @@
    def _ann_file(self, menuitem):   '''User selected annotate file from the file list context menu''' + from hggtk import datamine   rev = self.currev   dialog = datamine.DataMineDialog(self.ui, self.repo, self.cwd, [], {})   dialog.display() @@ -712,6 +713,7 @@
  self.glog_parent.reload_log(opts)   else:   # 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)
Change 1 of 2 Show Entire File hggtk/​datamine.py Stacked
 
20
21
22
23
 
24
25
26
 
141
142
143
 
144
145
146
 
20
21
22
 
23
24
25
26
 
141
142
143
144
145
146
147
@@ -20,7 +20,7 @@
 from hggtk.logview.colormap import AnnotateColorMap, AnnotateColorSaturation  from hggtk.logview.treeview import TreeView as LogTreeView   -from hggtk import gtklib, gdialog, changeset, history +from hggtk import gtklib, gdialog, changeset    class DataMineDialog(gdialog.GDialog):   COL_REVID = 0 @@ -141,6 +141,7 @@
  self.add_annotate_page(self.curpath, self.currev)     def _cmenu_file_log(self, menuitem): + from hggtk import history   dialog = history.GLog(self.ui, self.repo, self.cwd, [self.repo.root], {})   dialog.open_with_file(self.curpath)   dialog.display()
Change 1 of 3 Show Entire File hggtk/​gdialog.py Stacked
 
22
23
24
25
 
26
27
28
 
383
384
385
 
386
387
388
 
423
424
425
 
426
427
428
 
22
23
24
 
25
26
27
28
 
383
384
385
386
387
388
389
 
424
425
426
427
428
429
430
@@ -22,7 +22,7 @@
 from thgutil.i18n import _  from thgutil import shlib, hglib, paths   -from hggtk import gtklib, visdiff, thgconfig +from hggtk import gtklib    class SimpleMessage(gtklib.MessageDialog):   def run(self): @@ -383,6 +383,7 @@
  return True, textout     def _do_diff(self, patterns, options, modal=False): + from hggtk import visdiff, thgconfig   if self.ui.configbool('tortoisehg', 'vdiffnowin'):   tools = visdiff.readtools(self.ui)   preferred = self.ui.config('tortoisehg', 'vdiff', 'vdiff') @@ -423,6 +424,7 @@
  self._do_diff(file and [file] or [], self.opts)     def _view_file(self, stat, file, force_left=False): + from hggtk import thgconfig   def cleanup():   shutil.rmtree(self.tmproot)  
Change 1 of 2 Show Entire File hggtk/​history.py Stacked
 
21
22
23
24
 
25
26
27
 
74
75
76
 
77
78
79
 
21
22
23
 
24
25
26
27
 
74
75
76
77
78
79
80
@@ -21,7 +21,7 @@
 from hggtk.logview import treemodel  from hggtk.logview.treeview import TreeView as LogTreeView   -from hggtk import gtklib, hgcmd, synch, datamine, logfilter +from hggtk import gtklib, hgcmd, datamine, logfilter  from hggtk import backout, status, hgemail, tagadd, update, merge  from hggtk import changeset   @@ -74,6 +74,7 @@
  return tbar     def _synch_clicked(self, toolbutton, data): + from hggtk import synch   dlg = synch.SynchDialog([], False)   dlg.show_all()  
Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
20
21
22
23
24
 
25
26
27
 
1071
1072
1073
 
1074
1075
1076
 
20
21
22
 
 
23
24
25
26
 
1070
1071
1072
1073
1074
1075
1076
@@ -20,8 +20,7 @@
 from thgutil import hglib, shlib, paths    from hggtk.gdialog import GDialog, Confirm, Prompt, NativeSaveFileDialogWrapper -from hggtk import dialog, hgshelve, gtklib -from hggtk import history, rename, hgignore +from hggtk import dialog, hgshelve, gtklib, rename, hgignore    # file model row enumerations  FM_CHECKED = 0 @@ -1071,6 +1070,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.display()   return True