Changeset db78e426c178…
Parent 727ca6142730…
by
Changes to 9 files · Browse files at db78e426c178 Showing diff from parent 727ca6142730 Diff from another changeset...
@@ -26,8 +26,9 @@ from mercurial.node import nullrev
from mercurial import patch, util, match
+from tortoisehg.util.util import tounicode, isbfile
+
import tortoisehg.hgqt.hgviewlib # force apply monkeypatches
-from tortoisehg.hgqt.hgviewlib.util import tounicode, isbfile
def diff(repo, ctx1, ctx2=None, files=None):
"""
|
@@ -28,7 +28,7 @@ from PyQt4 import QtGui, QtCore, Qsci
from PyQt4.QtCore import Qt
-from tortoisehg.hgqt.hgviewlib.util import tounicode, rootpath
+from tortoisehg.util.util import tounicode, rootpath
from tortoisehg.hgqt.hgviewlib.qt4 import icon as geticon
from tortoisehg.hgqt.hgviewlib.qt4.hgdialogmixin import HgDialogMixin
|
@@ -32,8 +32,9 @@ SIGNAL = QtCore.SIGNAL
nullvariant = QtCore.QVariant()
+from tortoisehg.util.util import exec_flag_changed, isbfile, bfilepath
+
from tortoisehg.hgqt.hgviewlib.decorators import timeit
-from tortoisehg.hgqt.hgviewlib.util import exec_flag_changed, isbfile, bfilepath
from tortoisehg.hgqt.hgviewlib.config import HgConfig
from tortoisehg.hgqt.hgviewlib.qt4 import icon as geticon
|
@@ -27,7 +27,7 @@ from PyQt4 import QtGui, QtCore, Qsci
from PyQt4.QtCore import Qt
-from tortoisehg.hgqt.hgviewlib.util import tounicode
+from tortoisehg.util.util import tounicode
from tortoisehg.hgqt.hgviewlib.qt4 import icon as geticon
from tortoisehg.hgqt.hgviewlib.qt4.hgdialogmixin import HgDialogMixin
|
@@ -26,10 +26,11 @@ from mercurial.revlog import LookupError
from mercurial import util, error
+from tortoisehg.util.util import tounicode, isbfile, Curry
+
from tortoisehg.hgqt.hgviewlib.hggraph import Graph, ismerge, diff as revdiff
from tortoisehg.hgqt.hgviewlib.hggraph import revision_grapher, filelog_grapher
from tortoisehg.hgqt.hgviewlib.config import HgConfig
-from tortoisehg.hgqt.hgviewlib.util import tounicode, isbfile, Curry
from tortoisehg.hgqt.hgviewlib.qt4 import icon as geticon
from tortoisehg.hgqt.hgviewlib.decorators import timeit
|
@@ -30,9 +30,10 @@ SIGNAL = QtCore.SIGNAL
nullvariant = QtCore.QVariant()
+from tortoisehg.util.util import format_desc, xml_escape
+
from tortoisehg.hgqt.hgviewlib.decorators import timeit
from tortoisehg.hgqt.hgviewlib.config import HgConfig
-from tortoisehg.hgqt.hgviewlib.util import format_desc, xml_escape
from tortoisehg.hgqt.hgviewlib.qt4 import icon as geticon
from tortoisehg.hgqt.hgviewlib.qt4.hgmanifestdialog import ManifestViewer
from tortoisehg.hgqt.hgviewlib.qt4.quickbar import QuickBar
|
@@ -17,8 +17,9 @@ from mercurial import ui, hg
from mercurial import util
-from tortoisehg.hgqt.hgviewlib.util import tounicode, has_closed_branch_support
-from tortoisehg.hgqt.hgviewlib.util import rootpath, find_repository
+from tortoisehg.util.util import tounicode, has_closed_branch_support
+from tortoisehg.util.util import rootpath, find_repository
+
from tortoisehg.hgqt.hgviewlib.hggraph import diff as revdiff
from tortoisehg.hgqt.hgviewlib.decorators import timeit
|
@@ -21,7 +21,8 @@
from PyQt4 import QtCore, QtGui
-from tortoisehg.hgqt.hgviewlib.util import Curry
+from tortoisehg.util.util import Curry
+
from tortoisehg.hgqt.hgviewlib.qt4 import icon as geticon
Qt = QtCore.Qt
|
Loading...