Steve Borho avatar Steve Borho committed f835d7b

nautilus: avoid import of tortoisehg.hgtk.gtklib

Copy the markup_escape_text fixup code directly into the nautilus
extension.

Comments (0)

Files changed (1)

contrib/nautilus-thg.py

 import os
 import sys
 
+if gtk.gtk_version < (2, 14, 0):
+    # at least on 2.12.12, gtk widgets can be confused by control
+    # char markups (like "&#x1;"), so use cgi.escape instead
+    from cgi import escape as markup_escape_text
+else:
+    from gobject import markup_escape_text
+
 try:
     from mercurial import demandimport
 except ImportError:
 _thg_path()
 
 from tortoisehg.util import paths, debugthg, cachethg
-from tortoisehg.hgtk import gtklib
 
 if debugthg.debug('N'):
     debugf = debugthg.debugf
         parents = '\n'.join([short(p.node()) for p in ctx.parents()])
         description = ctx.description()
         user = ctx.user()
-        user = gtklib.markup_escape_text(user)
+        user = markup_escape_text(user)
         tags = ', '.join(ctx.tags())
         branch = ctx.branch()
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.