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

thgconfig: replace all relative imports

Changeset 2cb38c6f5f31…

Parent a59df07065a5…

by Steve Borho

Changes to one file · Browse files at 2cb38c6f5f31 Showing diff from parent a59df07065a5 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​thgconfig.py Stacked
 
11
12
13
14
 
15
16
17
18
19
 
20
21
22
 
597
598
599
600
601
 
602
603
604
 
846
847
848
849
850
851
852
 
11
12
13
 
14
15
16
17
18
 
19
20
21
22
 
597
598
599
 
 
600
601
602
603
 
845
846
847
 
848
849
850
@@ -11,12 +11,12 @@
 import urlparse  import threading   -from mercurial import hg, ui, util, url +from mercurial import hg, ui, util, url, filemerge    from thgutil.i18n import _  from thgutil import hglib, shlib, paths, iniparse   -from hggtk import dialog, gdialog, gtklib +from hggtk import dialog, gdialog, gtklib, hgcmd    _unspecstr = _('<unspecified>')   @@ -597,8 +597,7 @@
  if testpath[0] == '~':   testpath = os.path.expanduser(testpath)   cmdline = ['hg', 'incoming', '--verbose', testpath] - from hgcmd import CmdDialog - dlg = CmdDialog(cmdline) + dlg = hgcmd.CmdDialog(cmdline)   dlg.run()   dlg.hide()   @@ -846,7 +845,6 @@
  elif cpath == 'ui.merge':   # Special case, add [merge-tools] to possible values   try: - from mercurial import filemerge   tools = []   for key, value in self.ui.configitems('merge-tools'):   t = key.split('.')[0]