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

hggtk, thgutil: move Python packages under tortoisehg

During the move, take the opportunity to rename hggtk->hgtk and thgutil->util
This serves two purposes, to make us better Python citizens and to dogfood our
support for renames.

Changeset db36d1f7e96a…

Parent 61482ea34fd0…

by Steve Borho

Changes to 64 files · Browse files at db36d1f7e96a Showing diff from parent 61482ea34fd0 Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​nautilus-thg.py Stacked
 
35
36
37
38
 
39
40
41
42
43
44
 
 
45
46
47
 
62
63
64
65
 
66
67
68
 
35
36
37
 
38
39
40
41
42
 
 
43
44
45
46
47
 
62
63
64
 
65
66
67
68
@@ -35,13 +35,13 @@
  pfile = pfile[:-1]   path = os.path.dirname(os.path.dirname(os.path.realpath(pfile)))   thgpath = os.path.normpath(path) - testpath = os.path.join(thgpath, 'thgutil') + testpath = os.path.join(thgpath, 'tortoisehg')   if os.path.isdir(testpath) and thgpath not in sys.path:   sys.path.insert(0, thgpath)  _thg_path()   -from thgutil import paths, debugthg, hglib, cachethg -from hggtk import gtklib +from tortoisehg.util import paths, debugthg, hglib, cachethg +from tortoisehg.hgtk import gtklib    if debugthg.debug('N'):   debugf = debugthg.debugf @@ -62,7 +62,7 @@
  self.allvfs = {}   self.inv_dirs = set()   - from thgutil import menuthg + from tortoisehg.util import menuthg   self.hgtk = paths.find_in_path('hgtk')   self.menu = menuthg.menuThg()   self.notify = os.path.expanduser('~/.tortoisehg/notify')
Change 1 of 2 Show Entire File contrib/​tortoisehg.spec Stacked
 
35
36
37
38
 
39
40
41
 
62
63
64
65
66
 
 
67
68
69
 
35
36
37
 
38
39
40
41
 
62
63
64
 
 
65
66
67
68
69
@@ -35,7 +35,7 @@
 # Fix for nautilus python extensions in lib64 on x86_64  sed -i "s,lib/nautilus,%{_lib}/nautilus,g" setup.py   -cat > thgutil/config.py << EOT +cat > tortoisehg/util/config.py << EOT  bin_path = "%{_bindir}"  license_path = "%{_docdir}/%{name}-%{version}/COPYING.txt"  locale_path = "%{_datadir}/locale" @@ -62,8 +62,8 @@
 %defattr(-,root,root,-)  %doc COPYING.txt ReleaseNotes.txt doc/build/html/  %{_bindir}/hgtk -%{python_sitelib}/hggtk/ -%{python_sitelib}/thgutil/ +%{python_sitelib}/tortoisehg/hgtk/ +%{python_sitelib}/tortoisehg/util/  %{python_sitelib}/tortoisehg-*.egg-info  %{_datadir}/pixmaps/tortoisehg/  %{_datadir}/locale/*/LC_MESSAGES/tortoisehg.mo
Change 1 of 1 Show Entire File hggtk/​rename.py Stacked
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,73 +0,0 @@
-# rename.py - TortoiseHg's dialogs for handling renames -# -# Copyright 2009 Steve Borho <steve@borho.org> -# -# This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. - -import sys -import gtk -import cStringIO - -from mercurial import hg, ui, util, commands - -from thgutil.i18n import _ -from thgutil import hglib, paths - -from hggtk import dialog - -def run(ui, *pats, **opts): - fname, target = '', '' - try: - fname = pats[0] - target = pats[1] - except IndexError: - pass - fname = util.normpath(fname) - if target: - target = hglib.toutf(util.normpath(target)) - else: - target = hglib.toutf(fname) - title = _('Rename ') + hglib.toutf(fname) - dlg = dialog.entry_dialog(None, title, True, target, rename_resp) - dlg.orig = fname - return dlg - -def rename_resp(dlg, response): - if response != gtk.RESPONSE_OK: - dlg.destroy() - return - try: - root = paths.find_root() - repo = hg.repository(ui.ui(), root) - except (ImportError, hglib.RepoError): - dlg.destroy() - return - - new_name = hglib.fromutf(dlg.entry.get_text()) - opts = {} - opts['force'] = False # Checkbox? Nah. - opts['after'] = False - opts['dry_run'] = False - - saved = sys.stderr - errors = cStringIO.StringIO() - toquit = False - try: - sys.stderr = errors - repo.ui.pushbuffer() - repo.ui.quiet = True - try: - commands.rename(repo.ui, repo, dlg.orig, new_name, **opts) - toquit = True - except (util.Abort, hglib.RepoError), inst: - dlg.error_dialog(None, _('rename error'), str(inst)) - toquit = False - finally: - sys.stderr = saved - textout = errors.getvalue() + repo.ui.popbuffer() - errors.close() - if len(textout) > 1: - dlg.error_dialog(None, _('rename error'), textout) - elif toquit: - dlg.destroy()
Change 1 of 3 Show Entire File hgtk Stacked
 
11
12
13
14
 
15
16
17
18
19
20
 
21
22
23
 
30
31
32
33
 
34
35
36
37
38
 
39
40
 
41
42
43
 
51
52
53
54
 
55
56
57
58
59
60
 
61
62
63
64
65
66
 
 
67
68
69
 
11
12
13
 
14
15
16
17
18
19
 
20
21
22
23
 
30
31
32
 
33
34
35
36
37
 
38
39
 
40
41
42
43
 
51
52
53
 
54
55
56
57
58
59
 
60
61
62
63
64
 
 
65
66
67
68
69
@@ -11,13 +11,13 @@
   if hasattr(sys, "frozen"):   # Prepend C:\Program Files\TortoiseHg\gtk (equiv) to the path - from thgutil import paths + from tortoisehg.util import paths   gtkpath = os.path.join(paths.bin_path, 'gtk')   os.environ['PATH'] = os.pathsep.join([gtkpath, os.environ['PATH']])  else:   # if hgtk is a symlink, insert symlink target directory in sys.path   thgpath = os.path.dirname(os.path.realpath(__file__)) - testpath = os.path.join(thgpath, 'thgutil') + testpath = os.path.join(thgpath, 'tortoisehg')   if os.path.isdir(testpath) and thgpath not in sys.path:   sys.path.insert(0, thgpath)   @@ -30,14 +30,14 @@
 demandimport.ignore.append('win32com.shell')  demandimport.enable()  from mercurial import ui, util -from thgutil.hgversion import hgversion, checkhgversion +from tortoisehg.util.hgversion import hgversion, checkhgversion  import cStringIO  import traceback    try: - import hggtk.hgtk + import tortoisehg.hgtk.hgtk  except ImportError: - sys.stderr.write("abort: couldn't find hggtk libraries in [%s]\n" % + sys.stderr.write("abort: couldn't find hgtk libraries in [%s]\n" %   ';'.join(sys.path))   sys.stderr.write("(check your install and PYTHONPATH)\n")   sys.exit(-1) @@ -51,19 +51,19 @@
  sys.exit(1)    if not capt or 'THGDEBUG' in os.environ: - sys.exit(hggtk.hgtk.dispatch(sys.argv[1:])) + sys.exit(tortoisehg.hgtk.hgtk.dispatch(sys.argv[1:]))  else:   mystderr = cStringIO.StringIO()   origstderr = sys.stderr   sys.stderr = mystderr   try: - ret = hggtk.hgtk.dispatch(sys.argv[1:]) + ret = tortoisehg.hgtk.hgtk.dispatch(sys.argv[1:])   sys.stderr = origstderr   mystderr.seek(0)   for l in mystderr.readlines():   if l.startswith('Traceback') or l.startswith('TypeError'): - from hggtk.bugreport import run - from hggtk.hgtk import gtkrun + from tortoisehg.hgtk.bugreport import run + from tortoisehg.hgtk.hgtk import gtkrun   error = 'Recoverable runtime error (stderr):\n'   error += mystderr.getvalue()   opts = {}
Change 1 of 4 Show Entire File setup.py Stacked
 
56
57
58
59
 
 
60
61
62
 
128
129
130
131
 
 
132
133
134
 
139
140
141
142
 
143
144
145
 
168
169
170
171
 
172
173
174
175
176
177
178
179
 
 
180
181
182
 
56
57
58
 
59
60
61
62
63
 
129
130
131
 
132
133
134
135
136
 
141
142
143
 
144
145
146
147
 
170
171
172
 
173
174
175
176
177
178
179
 
 
180
181
182
183
184
@@ -56,7 +56,8 @@
  # Specific definitios for Windows NT-alike installations   _scripts = []   _data_files = [] - _packages = ['hggtk', 'hggtk.logview', 'thgutil'] + _packages = ['tortoisehg.hgtk', 'tortoisehg.hgtk.logview', + 'tortoisehg.util']   extra = {}   hgextmods = []   @@ -128,7 +129,8 @@
  # Specific definitios for Posix installations   _extra = {}   _scripts = ['hgtk'] - _packages = ['hggtk', 'hggtk.logview', 'thgutil'] + _packages = ['tortoisehg.hgtk', 'tortoisehg.hgtk.logview', + 'tortoisehg.util']   _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),   [os.path.join(root, file_) for file_ in files])   for root, dirs, files in os.walk('icons')] @@ -139,7 +141,7 @@
  ['contrib/nautilus-thg.py'])]     # Create a config.py. Distributions will need to supply their own - cfgfile = os.path.join('thgutil', 'config.py') + cfgfile = os.path.join('tortoisehg', 'util', 'config.py')   if not os.path.exists(cfgfile) and not os.path.exists('.hg/requires'):   f = open(cfgfile, "w")   f.write('bin_path = "/usr/bin"\n') @@ -168,15 +170,15 @@
 except OSError:   version = "unknown"   -verfile = os.path.join("thgutil", "__version__.py") +verfile = os.path.join('tortoisehg', 'util', '__version__.py')  if version != 'unknown' or not os.path.exists(verfile):   f = file(verfile, "w")   f.write('# this file is autogenerated by setup.py\n')   f.write('version = "%s"\n' % version)   f.close()  else: - import thgutil.__version__ - version = thgutil.__version__.version + import tortoisehg.util.__version__ + version = tortoisehg.util.__version__.version    setup(name="tortoisehg",   version=version,
Change 1 of 3 Show Entire File thgtaskbar.py Stacked
 
24
25
26
27
28
 
 
29
30
31
32
33
34
35
 
45
46
47
48
 
49
50
51
 
172
173
174
175
 
176
177
178
 
24
25
26
 
 
27
28
29
30
31
 
32
33
34
 
44
45
46
 
47
48
49
50
 
171
172
173
 
174
175
176
177
@@ -24,12 +24,11 @@
 demandimport.ignore.append('win32com.shell')  demandimport.enable()  from mercurial import ui, error -from thgutil.i18n import agettext as _ -from thgutil import thread2, paths, shlib +from tortoisehg.util.i18n import agettext as _ +from tortoisehg.util import thread2, paths, shlib    if hasattr(sys, "frozen"):   # Insert PATH to binary installer gtk directory - from thgutil import paths   gtkpath = os.path.join(paths.bin_path, 'gtk')   os.environ['PATH'] = os.pathsep.join([gtkpath, os.environ['PATH']])   # Give stdout/stderr closed attributes to prevent ui.py errors @@ -45,7 +44,7 @@
  # Try and find a custom icon   print "SetIcon(%s)" % name   hinst = GetModuleHandle(None) - from thgutil.paths import get_tortoise_icon + from tortoisehg.util.paths import get_tortoise_icon   iconPathName = get_tortoise_icon(name)   if iconPathName and os.path.isfile(iconPathName):   icon_flags = win32con.LR_LOADFROMFILE | win32con.LR_DEFAULTSIZE @@ -172,7 +171,7 @@
  def launchgui(self):   def launch():   import gtk - from hggtk import taskbarui, hgtk + from tortoisehg.hgtk import taskbarui   dlg = taskbarui.TaskBarUI(logger.getqueue(), requests)   dlg.show_all()   dlg.connect('destroy', gtk.main_quit)
Show Entire File tortoisehg/​__init__.py Stacked
copied from hggtk/__init__.py
(No changes)
Show Entire File tortoisehg/​hgtk/​__init__.py Stacked
renamed from hggtk/__init__.py
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​about.py Stacked
renamed from hggtk/about.py
 
11
12
13
14
15
 
 
16
17
 
18
19
20
 
11
12
13
 
 
14
15
16
 
17
18
19
20
@@ -11,10 +11,10 @@
 import gtk  import threading   -from thgutil.i18n import _ -from thgutil import version, paths, hglib +from tortoisehg.util.i18n import _ +from tortoisehg.util import version, paths, hglib   -from hggtk import gtklib, hgtk +from tortoisehg.hgtk import gtklib, hgtk    def browse_url(url):   def start_browser():
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​archive.py Stacked
renamed from hggtk/archive.py
 
12
13
14
15
16
 
 
17
18
 
19
20
21
 
12
13
14
 
 
15
16
17
 
18
19
20
21
@@ -12,10 +12,10 @@
   from mercurial import hg, ui   -from thgutil.i18n import _ -from thgutil import hglib, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, paths   -from hggtk import hgcmd, gtklib +from tortoisehg.hgtk import hgcmd, gtklib    _working_dir_parent_ = _('= Working Directory Parent =')  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​backout.py Stacked
renamed from hggtk/backout.py
 
12
13
14
15
16
 
 
17
18
 
19
20
21
 
12
13
14
 
 
15
16
17
 
18
19
20
21
@@ -12,10 +12,10 @@
   from mercurial import hg, ui   -from thgutil.i18n import _ -from thgutil import hglib, paths, i18n, settings +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, paths, i18n, settings   -from hggtk import changesetinfo, gtklib, hgcmd, gdialog +from tortoisehg.hgtk import changesetinfo, gtklib, hgcmd, gdialog    keep = i18n.keepgettext()  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​bugreport.py Stacked
renamed from hggtk/bugreport.py
 
10
11
12
13
14
15
 
 
 
16
17
18
 
10
11
12
 
 
 
13
14
15
16
17
18
@@ -10,9 +10,9 @@
 import pango    from mercurial import extensions -from thgutil.i18n import _ -from thgutil import hglib, version -from hggtk import gdialog +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, version +from tortoisehg.hgtk import gdialog    class BugReport(gdialog.GDialog):   """GTK+ based dialog for displaying traceback info to the user in a
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
renamed from hggtk/changeset.py
 
13
14
15
16
17
18
 
 
 
19
20
 
21
22
23
 
677
678
679
680
 
681
682
683
 
694
695
696
697
 
698
699
700
 
13
14
15
 
 
 
16
17
18
19
 
20
21
22
23
 
677
678
679
 
680
681
682
683
 
694
695
696
 
697
698
699
700
@@ -13,11 +13,11 @@
   from mercurial import cmdutil, context, util, ui, hg, patch, mdiff   -from thgutil.i18n import _ -from thgutil.hglib import * -from thgutil import shlib +from tortoisehg.util.i18n import _ +from tortoisehg.util.hglib import * +from tortoisehg.util import shlib   -from hggtk import gdialog, gtklib, hgcmd +from tortoisehg.hgtk import gdialog, gtklib, hgcmd    class ChangeSet(gdialog.GDialog):   'GTK+ based dialog for displaying repository logs' @@ -677,7 +677,7 @@
    def ann_file(self, menuitem):   'User selected annotate file from the file list context menu' - from hggtk import datamine + from tortoisehg.hgtk import datamine   rev = self.currev   dialog = datamine.DataMineDialog(self.ui, self.repo, self.cwd, [], {})   dialog.display() @@ -694,7 +694,7 @@
  self.glog_parent.reload_log(**opts)   else:   # Else launch our own glog instance - from hggtk import history + from tortoisehg.hgtk import history   dlg = history.run(self.ui, filehist=self.curfile)   dlg.display()  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​changesetinfo.py Stacked
renamed from hggtk/changesetinfo.py
 
10
11
12
13
14
 
 
15
16
 
17
18
19
 
10
11
12
 
 
13
14
15
 
16
17
18
19
@@ -10,10 +10,10 @@
 import os  import gtk   -from thgutil.i18n import _ -from thgutil import hglib +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib   -from hggtk import gtklib +from tortoisehg.hgtk import gtklib    def changesetinfo(repo, revid, head=False):   def lbl(str, bold=False, right=False):
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​clone.py Stacked
renamed from hggtk/clone.py
 
12
13
14
15
16
17
 
 
 
18
19
20
 
12
13
14
 
 
 
15
16
17
18
19
20
@@ -12,9 +12,9 @@
 import traceback    from mercurial import ui, util -from thgutil.i18n import _ -from thgutil import hglib, shlib, settings -from hggtk import gdialog, gtklib, hgcmd +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, shlib, settings +from tortoisehg.hgtk import gdialog, gtklib, hgcmd    class CloneDialog(gtk.Dialog):   """ Dialog to clone a Mercurial repo """
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​commit.py Stacked
renamed from hggtk/commit.py
 
18
19
20
21
22
 
 
23
24
25
26
 
 
27
28
29
 
745
746
747
748
 
749
750
751
 
18
19
20
 
 
21
22
23
 
 
 
24
25
26
27
28
 
744
745
746
 
747
748
749
750
@@ -18,12 +18,11 @@
   from mercurial import ui, hg, util, patch, cmdutil   -from thgutil.i18n import _ -from thgutil import shlib, hglib +from tortoisehg.util.i18n import _ +from tortoisehg.util import shlib, hglib   -from hggtk.status import GStatus, FM_STATUS, FM_CHECKED, FM_PATH_UTF8 -from hggtk.status import DM_REJECTED, DM_CHUNK_ID -from hggtk import gtklib, thgconfig, gdialog, hgcmd +from tortoisehg.hgtk.status import GStatus, FM_STATUS, FM_CHECKED, FM_PATH_UTF8 +from tortoisehg.hgtk import gtklib, thgconfig, gdialog, hgcmd    class BranchOperationDialog(gtk.Dialog):   def __init__(self, branch, close, mergebranches): @@ -745,7 +744,7 @@
      def changelog_clicked(self, toolbutton, data=None): - from hggtk import history + from tortoisehg.hgtk import history   dlg = history.run(self.ui)   dlg.display()   return True
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​datamine.py Stacked
renamed from hggtk/datamine.py
 
15
16
17
18
19
20
 
 
21
22
23
24
25
 
 
 
 
26
27
28
 
161
162
163
164
 
165
166
167
 
15
16
17
 
 
 
18
19
20
 
 
 
 
21
22
23
24
25
26
27
 
160
161
162
 
163
164
165
166
@@ -15,14 +15,13 @@
   from mercurial import util   -from thgutil.i18n import _ -from thgutil import hglib -from thgutil import thread2 +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, thread2   -from hggtk.logview.colormap import AnnotateColorMap, AnnotateColorSaturation -from hggtk.logview.treeview import TreeView as LogTreeView - -from hggtk import gtklib, gdialog, changeset +from tortoisehg.hgtk.logview.colormap import AnnotateColorMap +from tortoisehg.hgtk.logview.colormap import AnnotateColorSaturation +from tortoisehg.hgtk.logview.treeview import TreeView as LogTreeView +from tortoisehg.hgtk import gtklib, gdialog, changeset    class DataMineDialog(gdialog.GDialog):   COL_REVID = 0 @@ -161,7 +160,7 @@
  self.add_annotate_page(self.curpath, self.currev)     def cmenu_file_log(self, menuitem): - from hggtk import history + from tortoisehg.hgtk import history   dlg = history.run(self.ui, filehist=self.curpath)   dlg.display()  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​dialog.py Stacked
renamed from hggtk/dialog.py
 
15
16
17
18
19
 
 
20
21
22
 
15
16
17
 
 
18
19
20
21
22
@@ -15,8 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA    import gtk -from thgutil.i18n import _ -from hggtk import gtklib +from tortoisehg.util.i18n import _ +from tortoisehg.hgtk import gtklib    def entry_dialog(parent, msg, visible=True, default='', respfunc=None):   """ Allow a user to enter a text string (username/password)
Change 1 of 4 Show Entire File tortoisehg/​hgtk/​gdialog.py Stacked
renamed from hggtk/gdialog.py
 
17
18
19
20
21
 
 
22
23
 
24
25
26
 
344
345
346
347
 
348
349
350
 
517
518
519
520
 
521
522
523
 
530
531
532
533
 
534
535
536
 
17
18
19
 
 
20
21
22
 
23
24
25
26
 
344
345
346
 
347
348
349
350
 
517
518
519
 
520
521
522
523
 
530
531
532
 
533
534
535
536
@@ -17,10 +17,10 @@
   from mercurial import cmdutil, util, ui, hg, commands   -from thgutil.i18n import _ -from thgutil import settings, hglib, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import settings, hglib, paths   -from hggtk import gtklib +from tortoisehg.hgtk import gtklib    class SimpleMessage(gtklib.MessageDialog):   def run(self): @@ -344,7 +344,7 @@
  if not url.startswith('http'):   docpath = os.path.dirname(paths.get_license_path())   url = os.path.join(docpath, url) - from hggtk import about + from tortoisehg.hgtk import about   about.browseurl(url)     def launch(self, item, app): @@ -517,7 +517,7 @@
  return True, textout     def _do_diff(self, canonpats, options): - from hggtk import visdiff + from tortoisehg.hgtk import visdiff   options['canonpats'] = canonpats   dialog = visdiff.run(self.ui, **options)   if not dialog: @@ -530,7 +530,7 @@
  self._do_diff(file and [file] or [], self.opts)     def _view_files(self, files, otherparent): - from hggtk import thgconfig + from tortoisehg.hgtk import thgconfig   def cleanup():   shutil.rmtree(self.tmproot)  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​gorev.py Stacked
renamed from hggtk/gorev.py
 
11
12
13
14
15
 
 
16
17
18
 
11
12
13
 
 
14
15
16
17
18
@@ -11,8 +11,8 @@
 import gobject  import mercurial   -from thgutil.i18n import _ -from hggtk import gtklib, gdialog +from tortoisehg.util.i18n import _ +from tortoisehg.hgtk import gtklib, gdialog      class GotoRevDialog(gtk.Dialog):
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​gtklib.py Stacked
renamed from hggtk/gtklib.py
 
12
13
14
15
16
 
 
17
18
 
19
20
21
 
329
330
331
332
 
333
334
335
 
12
13
14
 
 
15
16
17
 
18
19
20
21
 
329
330
331
 
332
333
334
335
@@ -12,10 +12,10 @@
 import gobject  import pango   -from thgutil.i18n import _ -from thgutil import paths, hglib +from tortoisehg.util.i18n import _ +from tortoisehg.util import paths, hglib   -from hggtk import hgtk +from tortoisehg.hgtk import hgtk    if gtk.gtk_version < (2, 14, 0):   # at least on 2.12.12, gtk widgets can be confused by control @@ -329,7 +329,7 @@
  pass   else:   def selectlang(senderitem): - from hggtk import dialog + from tortoisehg.hgtk import dialog   spell = gtkspell.get_from_text_view(textview)   lang = ''   while True:
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​guess.py Stacked
renamed from hggtk/guess.py
 
15
16
17
18
19
20
 
 
 
21
22
 
23
24
25
 
15
16
17
 
 
 
18
19
20
21
 
22
23
24
25
@@ -15,11 +15,11 @@
   from mercurial import hg, ui, mdiff, cmdutil, match, util   -from thgutil.i18n import _ -from thgutil.hglib import toutf, fromutf, diffexpand, RepoError -from thgutil import shlib, paths, thread2, settings +from tortoisehg.util.i18n import _ +from tortoisehg.util.hglib import toutf, fromutf, diffexpand, RepoError +from tortoisehg.util import shlib, paths, thread2, settings   -from hggtk import gtklib +from tortoisehg.hgtk import gtklib    # This function and some key bits below borrowed ruthelessly from  # Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgcmd.py Stacked
renamed from hggtk/hgcmd.py
 
12
13
14
15
16
 
 
17
18
 
19
20
21
 
12
13
14
 
 
15
16
17
 
18
19
20
21
@@ -12,10 +12,10 @@
 import os  import Queue   -from thgutil.i18n import _ -from thgutil import shlib, hglib +from tortoisehg.util.i18n import _ +from tortoisehg.util import shlib, hglib   -from hggtk import gtklib, hgthread +from tortoisehg.hgtk import gtklib, hgthread    class CmdDialog(gtk.Dialog):   def __init__(self, cmdline, progressbar=True):
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgemail.py Stacked
renamed from hggtk/hgemail.py
 
15
16
17
18
19
 
 
20
21
 
22
23
24
 
15
16
17
 
 
18
19
20
 
21
22
23
24
@@ -15,10 +15,10 @@
   from mercurial import hg, ui, extensions   -from thgutil.i18n import _ -from thgutil import hglib, settings +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, settings   -from hggtk import gtklib, dialog, thgconfig, hgcmd +from tortoisehg.hgtk import gtklib, dialog, thgconfig, hgcmd    class EmailDialog(gtk.Window):   """ Send patches or bundles via email """
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgignore.py Stacked
renamed from hggtk/hgignore.py
 
12
13
14
15
16
 
 
17
18
 
19
20
21
 
12
13
14
 
 
15
16
17
 
18
19
20
21
@@ -12,10 +12,10 @@
   from mercurial import hg, ui, match, util   -from thgutil.i18n import _ -from thgutil import shlib, hglib, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import shlib, hglib, paths   -from hggtk import gtklib, gdialog +from tortoisehg.hgtk import gtklib, gdialog    class HgIgnoreDialog(gtk.Window):   'Edit a reposiory .hgignore file'
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hginit.py Stacked
renamed from hggtk/hginit.py
 
10
11
12
13
14
 
 
15
16
 
17
18
19
 
10
11
12
 
 
13
14
15
 
16
17
18
19
@@ -10,10 +10,10 @@
   from mercurial import hg, ui, util   -from thgutil.i18n import _ -from thgutil import hglib, shlib +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, shlib   -from hggtk import dialog, gtklib +from tortoisehg.hgtk import dialog, gtklib    class InitDialog(gtk.Dialog):   """ Dialog to initialize a Mercurial repo """
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgthread.py Stacked
renamed from hggtk/hgthread.py
 
11
12
13
14
15
 
 
16
17
 
18
19
20
 
11
12
13
 
 
14
15
16
 
17
18
19
20
@@ -11,10 +11,10 @@
   from mercurial import ui, util   -from thgutil.i18n import _ -from thgutil import hglib, thread2 +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, thread2   -from hggtk import dialog, gdialog +from tortoisehg.hgtk import dialog, gdialog    class GtkUi(ui.ui):   '''
Change 1 of 8 Show Entire File tortoisehg/​hgtk/​hgtk.py Stacked
renamed from hggtk/hgtk.py
 
22
23
24
25
26
27
 
 
 
28
29
30
 
55
56
57
58
 
59
60
61
 
275
276
277
278
 
279
280
281
 
286
287
288
289
 
290
291
292
293
294
 
295
296
297
 
302
303
304
305
 
306
307
308
309
310
 
311
312
313
314
315
 
316
317
318
319
320
321
 
322
323
324
325
326
327
328
 
329
330
331
332
 
333
334
335
336
337
 
338
339
340
341
342
 
343
344
345
346
347
 
348
349
350
351
352
 
353
354
355
356
357
 
358
359
360
361
362
 
363
364
365
366
367
 
368
369
370
371
372
 
373
374
375
376
377
 
378
379
380
381
382
 
383
384
385
386
387
 
388
389
390
 
392
393
394
395
 
396
397
398
399
400
 
401
402
403
 
407
408
409
410
 
411
412
413
414
415
 
416
417
418
 
614
615
616
617
 
618
619
620
 
22
23
24
 
 
 
25
26
27
28
29
30
 
55
56
57
 
58
59
60
61
 
275
276
277
 
278
279
280
281
 
286
287
288
 
289
290
291
292
293
 
294
295
296
297
 
302
303
304
 
305
306
307
308
309
 
310
311
312
313
314
 
315
316
317
318
319
320
 
321
322
323
324
325
326
327
 
328
329
330
331
 
332
333
334
335
336
 
337
338
339
340
341
 
342
343
344
345
346
 
347
348
349
350
351
 
352
353
354
355
356
 
357
358
359
360
361
 
362
363
364
365
366
 
367
368
369
370
371
 
372
373
374
375
376
 
377
378
379
380
381
 
382
383
384
385
386
 
387
388
389
390
 
392
393
394
 
395
396
397
398
399
 
400
401
402
403
 
407
408
409
 
410
411
412
413
414
 
415
416
417
418
 
614
615
616
 
617
618
619
620
@@ -22,9 +22,9 @@
 import mercurial.ui as _ui  from mercurial import hg, util, fancyopts, cmdutil, extensions   -from thgutil.i18n import agettext as _ -from thgutil import hglib, paths, shlib -from thgutil import version as thgversion +from tortoisehg.util.i18n import agettext as _ +from tortoisehg.util import hglib, paths, shlib +from tortoisehg.util import version as thgversion    nonrepo_commands = '''userconfig clone debugcomplete init about help  version thgstatus serve''' @@ -55,7 +55,7 @@
  except KeyboardInterrupt:   print _('\nCaught keyboard interrupt, aborting.\n')   except: - from hggtk.bugreport import run + from tortoisehg.hgtk.bugreport import run   if '--debugger' in args:   pdb.post_mortem(sys.exc_info()[2])   error = traceback.format_exc() @@ -275,7 +275,7 @@
   def about(ui, *pats, **opts):   """about TortoiseHg""" - from hggtk.about import run + from tortoisehg.hgtk.about import run   gtkrun(run, ui, *pats, **opts)    def add(ui, *pats, **opts): @@ -286,12 +286,12 @@
   def thgstatus(ui, *pats, **opts):   """update TortoiseHg status cache""" - from hggtk.thgstatus import run + from tortoisehg.util.thgstatus import run   run(ui, *pats, **opts)    def clone(ui, *pats, **opts):   """clone tool""" - from hggtk.clone import run + from tortoisehg.hgtk.clone import run   gtkrun(run, ui, *pats, **opts)    def commit(ui, *pats, **opts): @@ -302,89 +302,89 @@
  if len(repo.parents()) > 1:   os.chdir(repo.root)   pats = [] - from hggtk.commit import run + from tortoisehg.hgtk.commit import run   gtkrun(run, ui, *pats, **opts)    def shelve(ui, *pats, **opts):   """shelve/unshelve tool""" - from hggtk.thgshelve import run + from tortoisehg.hgtk.thgshelve import run   gtkrun(run, ui, *pats, **opts)    def userconfig(ui, *pats, **opts):   """user configuration editor""" - from hggtk.thgconfig import run + from tortoisehg.hgtk.thgconfig import run   opts['repomode'] = False   gtkrun(run, ui, *pats, **opts)    def repoconfig(ui, *pats, **opts):   """repository configuration editor""" - from hggtk.thgconfig import run + from tortoisehg.hgtk.thgconfig import run   opts['repomode'] = True   gtkrun(run, ui, *pats, **opts)    def rename(ui, *pats, **opts):   """rename a single file or directory"""   if not pats or len(pats) > 2: - from hggtk import gdialog + from tortoisehg.hgtk import gdialog   gdialog.Prompt(_('Rename error'),   _('rename takes one or two path arguments'), None).run()   return - from hggtk.rename import run + from tortoisehg.hgtk.rename import run   gtkrun(run, ui, *pats, **opts)    def guess(ui, *pats, **opts):   """guess previous renames or copies""" - from hggtk.guess import run + from tortoisehg.hgtk.guess import run   gtkrun(run, ui, *pats, **opts)    def datamine(ui, *pats, **opts):   """repository search and annotate tool""" - from hggtk.datamine import run + from tortoisehg.hgtk.datamine import run   gtkrun(run, ui, *pats, **opts)    def hgignore(ui, *pats, **opts):   """ignore filter editor""" - from hggtk.hgignore import run + from tortoisehg.hgtk.hgignore import run   gtkrun(run, ui, *pats, **opts)    def hginit(ui, *pats, **opts):   """repository initialization tool""" - from hggtk.hginit import run + from tortoisehg.hgtk.hginit import run   gtkrun(run, ui, *pats, **opts)    def log(ui, *pats, **opts):   """changelog viewer""" - from hggtk.history import run + from tortoisehg.hgtk.history import run   gtkrun(run, ui, *pats, **opts)    def merge(ui, *pats, **opts):   """merge tool""" - from hggtk.merge import run + from tortoisehg.hgtk.merge import run   gtkrun(run, ui, *pats, **opts)    def recovery(ui, *pats, **opts):   """recover, rollback & verify""" - from hggtk.recovery import run + from tortoisehg.hgtk.recovery import run   gtkrun(run, ui, *pats, **opts)    def remove(ui, *pats, **opts):   """file status viewer in remove mode""" - from hggtk.status import run + from tortoisehg.hgtk.status import run   gtkrun(run, ui, *pats, **opts)    def revert(ui, *pats, **opts):   """file status viewer in revert mode""" - from hggtk.status import run + from tortoisehg.hgtk.status import run   gtkrun(run, ui, *pats, **opts)    def forget(ui, *pats, **opts):   """file status viewer in forget mode""" - from hggtk.status import run + from tortoisehg.hgtk.status import run   gtkrun(run, ui, *pats, **opts)    def serve(ui, *pats, **opts):   """web server""" - from hggtk.serve import run + from tortoisehg.hgtk.serve import run   if paths.find_root() == None and not opts['webdir_conf']:   raise hglib.RepoError(_("There is no Mercurial repository here"   " (.hg not found)")) @@ -392,12 +392,12 @@
   def status(ui, *pats, **opts):   """file status & diff viewer""" - from hggtk.status import run + from tortoisehg.hgtk.status import run   gtkrun(run, ui, *pats, **opts)    def synch(ui, *pats, **opts):   """repository synchronization tool""" - from hggtk.synch import run + from tortoisehg.hgtk.synch import run   cmd = opts['alias']   if cmd in ('push', 'outgoing', 'email'):   opts['pushmode'] = True @@ -407,12 +407,12 @@
   def update(ui, *pats, **opts):   """update/checkout tool""" - from hggtk.update import run + from tortoisehg.hgtk.update import run   gtkrun(run, ui, *pats, **opts)    def vdiff(ui, *pats, **opts):   """launch configured visual diff tool""" - from hggtk.visdiff import run, rawextdiff + from tortoisehg.hgtk.visdiff import run, rawextdiff   if opts.get('raw'):   rawextdiff(ui, *pats, **opts)   return @@ -614,7 +614,7 @@
   def archive(ui, *pats, **opts):   """create an unversioned archive of a repository revision""" - from hggtk.archive import run + from tortoisehg.hgtk.archive import run   gtkrun(run, ui, *pats, **opts)    globalopts = [
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​histdetails.py Stacked
renamed from hggtk/histdetails.py
 
8
9
10
11
 
12
13
 
14
15
16
 
8
9
10
 
11
12
 
13
14
15
16
@@ -8,9 +8,9 @@
 import gtk  import gobject   -from thgutil.i18n import _ +from tortoisehg.util.i18n import _   -from hggtk import gtklib +from tortoisehg.hgtk import gtklib    class LogDetailsDialog(gtk.Dialog):  
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​history.py Stacked
renamed from hggtk/history.py
 
14
15
16
17
18
 
 
19
20
 
21
22
23
24
 
 
 
25
26
27
 
122
123
124
125
 
126
127
128
 
14
15
16
 
 
17
18
19
 
20
21
 
 
 
22
23
24
25
26
27
 
122
123
124
 
125
126
127
128
@@ -14,14 +14,14 @@
   from mercurial import ui, hg, cmdutil, commands, extensions, util   -from thgutil.i18n import _ -from thgutil import hglib, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, paths   -from hggtk.logview.treeview import TreeView as LogTreeView +from tortoisehg.hgtk.logview.treeview import TreeView as LogTreeView   -from hggtk import gdialog, gtklib, hgcmd, datamine, logfilter, gorev -from hggtk import backout, status, hgemail, tagadd, update, merge, archive -from hggtk import changeset, thgconfig, thgmq, histdetails +from tortoisehg.hgtk import gdialog, gtklib, hgcmd, datamine, logfilter, gorev +from tortoisehg.hgtk import backout, status, hgemail, tagadd, update, merge +from tortoisehg.hgtk import archive, changeset, thgconfig, thgmq, histdetails    def create_menu(label, callback):   menuitem = gtk.MenuItem(label, True) @@ -122,7 +122,7 @@
  elif not parents == newparents:   self.refresh_model()   - from hggtk import synch + from tortoisehg.hgtk import synch   parents = [x.node() for x in self.repo.parents()]   dlg = synch.SynchDialog([], False, True)   dlg.set_notify_func(synch_callback, parents)
Show Entire File tortoisehg/​hgtk/​logview/​__init__.py Stacked
renamed from hggtk/logview/__init__.py
(No changes)
Show Entire File tortoisehg/​hgtk/​logview/​colormap.py Stacked
renamed from hggtk/logview/colormap.py
(No changes)
Show Entire File tortoisehg/​hgtk/​logview/​graphcell.py Stacked
renamed from hggtk/logview/graphcell.py
(No changes)
Show Entire File tortoisehg/​hgtk/​logview/​revgraph.py Stacked
renamed from hggtk/logview/revgraph.py
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​treemodel.py Stacked
renamed from hggtk/logview/treemodel.py
 
17
18
19
20
21
 
 
22
23
24
 
17
18
19
 
 
20
21
22
23
24
@@ -17,8 +17,8 @@
 import gtk  import gobject  from mercurial import util, templatefilters -from thgutil import hglib -from hggtk import gtklib +from tortoisehg.util import hglib +from tortoisehg.hgtk import gtklib    # treemodel row enumerated attributes  LINES = 0 # These elements come from the changelog walker
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​treeview.py Stacked
renamed from hggtk/logview/treeview.py
 
21
22
23
24
25
 
 
26
27
28
29
 
 
 
30
31
32
 
21
22
23
 
 
24
25
26
 
 
 
27
28
29
30
31
32
@@ -21,12 +21,12 @@
 import re  import time   -from thgutil.i18n import _ -from thgutil import hglib +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib   -from hggtk.logview import treemodel -from hggtk.logview.graphcell import CellRendererGraph -from hggtk.logview.revgraph import * +from tortoisehg.hgtk.logview import treemodel +from tortoisehg.hgtk.logview.graphcell import CellRendererGraph +from tortoisehg.hgtk.logview.revgraph import *      class TreeView(gtk.ScrolledWindow):
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
renamed from hggtk/merge.py
 
12
13
14
15
16
 
 
17
18
 
19
20
21
 
12
13
14
 
 
15
16
17
 
18
19
20
21
@@ -12,10 +12,10 @@
   from mercurial import hg, ui   -from thgutil.i18n import _ -from thgutil import hglib, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, paths   -from hggtk import changesetinfo, gtklib, commit, gdialog, hgcmd +from tortoisehg.hgtk import changesetinfo, gtklib, commit, gdialog, hgcmd    class MergeDialog(gtk.Window):   """ Dialog to merge revisions of a Mercurial repo """
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​recovery.py Stacked
renamed from hggtk/recovery.py
 
15
16
17
18
19
 
 
20
21
 
22
23
24
 
15
16
17
 
 
18
19
20
 
21
22
23
24
@@ -15,10 +15,10 @@
   from mercurial import hg, ui   -from thgutil.i18n import _ -from thgutil import hglib, shlib, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, shlib, paths   -from hggtk import gdialog, dialog, gtklib, hgthread +from tortoisehg.hgtk import gdialog, dialog, gtklib, hgthread    class RecoveryDialog(gtk.Window):   def __init__(self):
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​rename.py Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
@@ -0,0 +1,73 @@
+# rename.py - TortoiseHg's dialogs for handling renames +# +# Copyright 2009 Steve Borho <steve@borho.org> +# +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. + +import sys +import gtk +import cStringIO + +from mercurial import hg, ui, util, commands + +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, paths + +from tortoisehg.hgtk import dialog + +def run(ui, *pats, **opts): + fname, target = '', '' + try: + fname = pats[0] + target = pats[1] + except IndexError: + pass + fname = util.normpath(fname) + if target: + target = hglib.toutf(util.normpath(target)) + else: + target = hglib.toutf(fname) + title = _('Rename ') + hglib.toutf(fname) + dlg = dialog.entry_dialog(None, title, True, target, rename_resp) + dlg.orig = fname + return dlg + +def rename_resp(dlg, response): + if response != gtk.RESPONSE_OK: + dlg.destroy() + return + try: + root = paths.find_root() + repo = hg.repository(ui.ui(), root) + except (ImportError, hglib.RepoError): + dlg.destroy() + return + + new_name = hglib.fromutf(dlg.entry.get_text()) + opts = {} + opts['force'] = False # Checkbox? Nah. + opts['after'] = False + opts['dry_run'] = False + + saved = sys.stderr + errors = cStringIO.StringIO() + toquit = False + try: + sys.stderr = errors + repo.ui.pushbuffer() + repo.ui.quiet = True + try: + commands.rename(repo.ui, repo, dlg.orig, new_name, **opts) + toquit = True + except (util.Abort, hglib.RepoError), inst: + dlg.error_dialog(None, _('rename error'), str(inst)) + toquit = False + finally: + sys.stderr = saved + textout = errors.getvalue() + repo.ui.popbuffer() + errors.close() + if len(textout) > 1: + dlg.error_dialog(None, _('rename error'), textout) + elif toquit: + dlg.destroy()
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​serve.py Stacked
renamed from hggtk/serve.py
 
20
21
22
23
24
 
 
25
26
 
27
28
29
 
20
21
22
 
 
23
24
25
 
26
27
28
29
@@ -20,10 +20,10 @@
 from mercurial import hg, ui, commands, cmdutil, util  from mercurial.hgweb import server   -from thgutil.i18n import _ -from thgutil import hglib, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, paths   -from hggtk import dialog, gdialog, gtklib, thgconfig +from tortoisehg.hgtk import dialog, gdialog, gtklib, thgconfig    gservice = None  class ServeDialog(gtk.Window):
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​status.py Stacked
renamed from hggtk/status.py
 
18
19
20
21
22
 
 
23
24
 
25
26
27
 
1334
1335
1336
1337
 
1338
1339
1340
 
18
19
20
 
 
21
22
23
 
24
25
26
27
 
1334
1335
1336
 
1337
1338
1339
1340
@@ -18,10 +18,10 @@
 from mercurial import cmdutil, util, commands, patch, mdiff  from mercurial import merge as merge_   -from thgutil.i18n import _ -from thgutil import hglib, shlib, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, shlib, paths, hgshelve   -from hggtk import dialog, gdialog, hgshelve, gtklib, guess, hgignore +from tortoisehg.hgtk import dialog, gdialog, gtklib, guess, hgignore    # file model row enumerations  FM_CHECKED = 0 @@ -1334,7 +1334,7 @@
  def remove(menuitem, files):   self.hg_remove(files)   def log(menuitem, files): - from hggtk import history + from tortoisehg.hgtk import history   dlg = history.run(self.ui, canonpats=files)   dlg.display()   def forget(menuitem, files):
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​synch.py Stacked
renamed from hggtk/synch.py
 
17
18
19
20
21
 
 
22
23
24
 
 
25
26
27
 
17
18
19
 
 
20
21
22
 
 
23
24
25
26
27
@@ -17,11 +17,11 @@
   from mercurial import hg, ui, extensions, url   -from thgutil.i18n import _ -from thgutil import hglib, settings, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, settings, paths   -from hggtk import dialog, gtklib, hgthread, history, thgconfig, hgemail -from hggtk import thgshelve +from tortoisehg.hgtk import dialog, gtklib, hgthread, history, thgconfig +from tortoisehg.hgtk import thgshelve, hgemail    class SynchDialog(gtk.Window):   def __init__(self, repos=[], pushmode=False, fromlog=False):
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​tagadd.py Stacked
renamed from hggtk/tagadd.py
 
12
13
14
15
16
 
 
17
18
 
19
20
21
 
12
13
14
 
 
15
16
17
 
18
19
20
21
@@ -12,10 +12,10 @@
   from mercurial import hg, ui, util   -from thgutil.i18n import _ -from thgutil import hglib, settings, i18n +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, settings, i18n   -from hggtk import dialog, gtklib +from tortoisehg.hgtk import dialog, gtklib    keep = i18n.keepgettext()  
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​taskbarui.py Stacked
renamed from hggtk/taskbarui.py
 
9
10
11
12
13
14
 
 
 
15
16
17
 
207
208
209
210
 
211
212
213
 
9
10
11
 
 
 
12
13
14
15
16
17
 
207
208
209
 
210
211
212
213
@@ -9,9 +9,9 @@
 import gtk  import gobject   -from thgutil.i18n import _ -from thgutil import hglib, settings, menuthg -from hggtk import gtklib +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, settings, menuthg +from tortoisehg.hgtk import gtklib    shellcmds = '''about add clone commit datamine init log recovery  shelve synch status thgstatus userconf repoconf remove rename @@ -207,7 +207,7 @@
  return frame     def about(self, button): - from hggtk import about + from tortoisehg.hgtk import about   dlg = about.AboutDialog()   dlg.show_all()  
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​thgconfig.py Stacked
renamed from hggtk/thgconfig.py
 
14
15
16
17
18
 
 
19
20
 
21
22
23
 
734
735
736
737
 
738
739
740
 
14
15
16
 
 
17
18
19
 
20
21
22
23
 
734
735
736
 
737
738
739
740
@@ -14,10 +14,10 @@
   from mercurial import hg, ui, util, url, filemerge   -from thgutil.i18n import _ -from thgutil import hglib, settings, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, settings, paths   -from hggtk import dialog, gdialog, gtklib, hgcmd +from tortoisehg.hgtk import dialog, gdialog, gtklib, hgcmd    _unspecstr = _('<unspecified>')  _unspeclocalstr = hglib.fromutf(_unspecstr) @@ -734,7 +734,7 @@
  self.pathdata.get_path(i),   self.pathtree.get_column(0))   self.refresh_path_list() - # This method may be called from hggtk.sync, so ensure page is visible + # This method may be called from hgtk.sync, so ensure page is visible   self.notebook.set_current_page(3)   self.dirty_event()  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​thgmq.py Stacked
renamed from hggtk/thgmq.py
 
10
11
12
13
14
 
 
15
16
 
17
18
19
 
10
11
12
 
 
13
14
15
 
16
17
18
19
@@ -10,10 +10,10 @@
 import gobject  import pango   -from thgutil.i18n import _ -from thgutil import hglib +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib   -from hggtk import gtklib, hgcmd +from tortoisehg.hgtk import gtklib, hgcmd    # MQ patches row enumerations  MQ_INDEX = 0
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​thgshelve.py Stacked
renamed from hggtk/thgshelve.py
 
12
13
14
15
16
 
 
17
18
19
 
 
20
21
22
 
12
13
14
 
 
15
16
17
 
 
18
19
20
21
22
@@ -12,11 +12,11 @@
   from mercurial import util   -from thgutil.i18n import _ -from thgutil import hglib +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, hgshelve   -from hggtk.status import GStatus, FM_STATUS, FM_CHECKED -from hggtk import hgshelve, gdialog, gtklib +from tortoisehg.hgtk.status import GStatus, FM_STATUS, FM_CHECKED +from tortoisehg.hgtk import gdialog, gtklib    class GShelve(GStatus):   """GTK+ based dialog for displaying repository status and shelving changes.
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​update.py Stacked
renamed from hggtk/update.py
 
12
13
14
15
16
 
 
17
18
 
19
20
21
 
12
13
14
 
 
15
16
17
 
18
19
20
21
@@ -12,10 +12,10 @@
   from mercurial import hg, ui   -from thgutil.i18n import _ -from thgutil import hglib, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, paths   -from hggtk import hgcmd, gtklib +from tortoisehg.hgtk import hgcmd, gtklib    _branch_tip_ = _('= Current Branch Tip =')  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
renamed from hggtk/visdiff.py
 
15
16
17
18
19
 
 
20
21
 
22
23
24
 
15
16
17
 
 
18
19
20
 
21
22
23
24
@@ -15,10 +15,10 @@
   from mercurial import hg, ui, cmdutil, util   -from thgutil.i18n import _ -from thgutil import hglib, settings, paths +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib, settings, paths   -from hggtk import gdialog, gtklib +from tortoisehg.hgtk import gdialog, gtklib    try:   import win32con
Show Entire File tortoisehg/​util/​__init__.py Stacked
renamed from thgutil/__init__.py
(No changes)
Show Entire File tortoisehg/​util/​cachethg.py Stacked
renamed from thgutil/cachethg.py
(No changes)
Show Entire File tortoisehg/​util/​debugthg.py Stacked
renamed from thgutil/debugthg.py
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​util/​hglib.py Stacked
renamed from thgutil/hglib.py
 
22
23
24
25
 
26
27
28
 
22
23
24
 
25
26
27
28
@@ -22,7 +22,7 @@
 _encodingmode = encoding.encodingmode  _fallbackencoding = encoding.fallbackencoding   -from thgutil.hgversion import hgversion +from tortoisehg.util.hgversion import hgversion    def tounicode(s):   """
Change 1 of 1 Show Entire File tortoisehg/​util/​hgshelve.py Stacked
renamed from hggtk/hgshelve.py
 
21
22
23
24
25
 
 
26
27
28
 
21
22
23
 
 
24
25
26
27
28
@@ -21,8 +21,8 @@
 from mercurial import cmdutil, commands, cmdutil, hg, mdiff, patch, revlog  from mercurial import util, fancyopts   -from thgutil.i18n import _ -from thgutil import hglib +from tortoisehg.util.i18n import _ +from tortoisehg.util import hglib    lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)')  
Show Entire File tortoisehg/​util/​hgversion.py Stacked
renamed from thgutil/hgversion.py
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​util/​i18n.py Stacked
renamed from thgutil/i18n.py
 
7
8
9
10
 
11
12
13
 
7
8
9
 
10
11
12
13
@@ -7,7 +7,7 @@
   import gettext, sys  from gettext import gettext as _ -from thgutil import paths, hglib +from tortoisehg.util import paths, hglib    gettext.bindtextdomain("tortoisehg", paths.get_locale_path())  gettext.textdomain("tortoisehg")
Show Entire File tortoisehg/​util/​menuthg.py Stacked
renamed from thgutil/menuthg.py
(No changes)
Change 1 of 2 Show Entire File tortoisehg/​util/​paths.py Stacked
renamed from thgutil/paths.py
 
66
67
68
69
 
70
71
72
 
99
100
101
102
 
103
104
105
 
66
67
68
 
69
70
71
72
 
99
100
101
 
102
103
104
105
@@ -66,7 +66,7 @@
  return _winreg.QueryValue(_winreg.HKEY_LOCAL_MACHINE,   r"Software\TortoiseHg")   except: - return os.path.dirname(os.path.dirname(__file__)) + return os.path.dirname(os.path.dirname(os.path.dirname(__file__)))     def netdrive_status(drive):   """ @@ -99,7 +99,7 @@
  return None     def get_prog_root(): - path = os.path.dirname(os.path.dirname(__file__)) + path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))   return path     def netdrive_status(drive):
Show Entire File tortoisehg/​util/​settings.py Stacked
renamed from thgutil/settings.py
(No changes)
Show Entire File tortoisehg/​util/​shlib.py Stacked
renamed from thgutil/shlib.py
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​util/​thgstatus.py Stacked
renamed from hggtk/thgstatus.py
 
8
9
10
11
 
12
13
14
 
8
9
10
 
11
12
13
14
@@ -8,7 +8,7 @@
 '''update TortoiseHg status cache'''    from mercurial import hg -from thgutil import paths, shlib +from tortoisehg.util import paths, shlib  import os    def cachefilepath(repo):
Show Entire File tortoisehg/​util/​thread2.py Stacked
renamed from thgutil/thread2.py
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​util/​version.py Stacked
renamed from thgutil/version.py
 
5
6
7
8
 
9
10
11
 
5
6
7
 
8
9
10
11
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -from thgutil.i18n import _ +from tortoisehg.util.i18n import _    def version():   try:
Change 1 of 1 Show Entire File win32/​reggen.py Stacked
 
18
19
20
21
 
22
23
24
25
26
 
27
28
29
 
18
19
20
 
21
22
23
24
25
 
26
27
28
29
@@ -18,12 +18,12 @@
  pfile = pfile[:-1]   path = os.path.dirname(os.path.dirname(os.path.realpath(pfile)))   thgpath = os.path.normpath(path) - testpath = os.path.join(thgpath, 'thgutil') + testpath = os.path.join(thgpath, 'tortoisehg')   if os.path.isdir(testpath) and thgpath not in sys.path:   sys.path.insert(0, thgpath)  _thg_path()   -from thgutil.menuthg import thgcmenu +from tortoisehg.util.menuthg import thgcmenu    regkeytmpl = u'[HKEY_CURRENT_USER\\Software\\TortoiseHg\\CMenu\\%s\\%s]'  regheaders = ( u'Windows Registry Editor Version 5.00',