Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

eliminate /hgqt/hgviewlib subdirectory

Changeset 8ef38b068ffd…

Parent 437926385476…

by Adrian Buehlmann

Changes to 47 files · Browse files at 8ef38b068ffd Showing diff from parent 437926385476 Diff from another changeset...

Show Entire File tortoisehg/​hgqt/​__init__.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/__init__.py
(No changes)
Show Entire File tortoisehg/​hgqt/​blockmatcher.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/blockmatcher.py
(No changes)
Show Entire File tortoisehg/​hgqt/​config.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/config.py
(No changes)
Show Entire File tortoisehg/​hgqt/​decorators.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/decorators.py
(No changes)
Show Entire File tortoisehg/​hgqt/​filediffviewer.ui Stacked
renamed from tortoisehg/hgqt/hgviewlib/filediffviewer.ui
(No changes)
Show Entire File tortoisehg/​hgqt/​fileviewer.ui Stacked
renamed from tortoisehg/hgqt/hgviewlib/fileviewer.ui
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​helpviewer.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/helpviewer.py
 
14
15
16
17
18
19
 
 
 
20
21
22
 
14
15
16
 
 
 
17
18
19
20
21
22
@@ -14,9 +14,9 @@
   from PyQt4 import QtCore, QtGui, Qsci   -from tortoisehg.hgqt.hgviewlib import icon as geticon -from tortoisehg.hgqt.hgviewlib.hgdialogmixin import HgDialogMixin -from tortoisehg.hgqt.hgviewlib.hgviewhelp import help_msg, get_options_helpmsg +from tortoisehg.hgqt import icon as geticon +from tortoisehg.hgqt.hgdialogmixin import HgDialogMixin +from tortoisehg.hgqt.hgviewhelp import help_msg, get_options_helpmsg    Qt = QtCore.Qt  bold = QtGui.QFont.Bold
Show Entire File tortoisehg/​hgqt/​helpviewer.ui Stacked
renamed from tortoisehg/hgqt/hgviewlib/helpviewer.ui
(No changes)
Show Entire File tortoisehg/​hgqt/​helpviewer_ui.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/helpviewer_ui.py
(No changes)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​hgdialogmixin.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgdialogmixin.py
 
28
29
30
31
32
 
 
33
34
35
 
50
51
52
53
 
54
55
56
 
28
29
30
 
 
31
32
33
34
35
 
50
51
52
 
53
54
55
56
@@ -28,8 +28,8 @@
 SIGNAL = QtCore.SIGNAL  Qt = QtCore.Qt   -from tortoisehg.hgqt.hgviewlib.config import HgConfig -from tortoisehg.hgqt.hgviewlib import should_rebuild +from tortoisehg.hgqt.config import HgConfig +from tortoisehg.hgqt import should_rebuild    class HgDialogMixin(object):   """ @@ -50,7 +50,7 @@
  os.system('pyuic4 %s -o %s' % (uifile, pyfile))   try:   modname = osp.splitext(osp.basename(uifile))[0] + "_ui" - modname = "hgviewlib.%s" % modname + modname = "tortoisehg.hgqt.%s" % modname   mod = __import__(modname, fromlist=['*'])   classnames = [x for x in dir(mod) if x.startswith('Ui_')]   if len(classnames) == 1:
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​hgfiledialog.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgfiledialog.py
 
30
31
32
33
34
35
36
37
38
 
 
 
 
 
 
39
40
41
 
104
105
106
107
 
108
109
110
 
30
31
32
 
 
 
 
 
 
33
34
35
36
37
38
39
40
41
 
104
105
106
 
107
108
109
110
@@ -30,12 +30,12 @@
   from tortoisehg.util.util import tounicode, rootpath   -from tortoisehg.hgqt.hgviewlib import icon as geticon -from tortoisehg.hgqt.hgviewlib.hgdialogmixin import HgDialogMixin -from tortoisehg.hgqt.hgviewlib.hgrepomodel import FileRevModel -from tortoisehg.hgqt.hgviewlib.blockmatcher import BlockList, BlockMatch -from tortoisehg.hgqt.hgviewlib.lexers import get_lexer -from tortoisehg.hgqt.hgviewlib.quickbar import FindInGraphlogQuickBar +from tortoisehg.hgqt import icon as geticon +from tortoisehg.hgqt.hgdialogmixin import HgDialogMixin +from tortoisehg.hgqt.hgrepomodel import FileRevModel +from tortoisehg.hgqt.blockmatcher import BlockList, BlockMatch +from tortoisehg.hgqt.lexers import get_lexer +from tortoisehg.hgqt.quickbar import FindInGraphlogQuickBar    connect = QtCore.QObject.connect  disconnect = QtCore.QObject.disconnect @@ -104,7 +104,7 @@
  """   if self.repoviewer is None:   # prevent recursive import - from hgviewlib.hgrepoviewer import HgRepoViewer + from hgrepoviewer import HgRepoViewer   self.repoviewer = HgRepoViewer(self.repo)   self.repoviewer.goto(rev)   self.repoviewer.show()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hgfileview.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgfileview.py
 
34
35
36
37
38
 
 
39
40
41
42
43
44
45
 
 
 
 
 
 
46
47
48
 
34
35
36
 
 
37
38
39
 
 
 
 
 
 
40
41
42
43
44
45
46
47
48
@@ -34,15 +34,15 @@
   from tortoisehg.util.util import exec_flag_changed, isbfile, bfilepath   -from tortoisehg.hgqt.hgviewlib.decorators import timeit -from tortoisehg.hgqt.hgviewlib.config import HgConfig +from tortoisehg.hgqt.decorators import timeit +from tortoisehg.hgqt.config import HgConfig   -from tortoisehg.hgqt.hgviewlib import icon as geticon -from tortoisehg.hgqt.hgviewlib.hgfiledialog import FileViewer, FileDiffViewer -from tortoisehg.hgqt.hgviewlib.hgmanifestdialog import ManifestViewer -from tortoisehg.hgqt.hgviewlib.quickbar import QuickBar -from tortoisehg.hgqt.hgviewlib.lexers import get_lexer -from tortoisehg.hgqt.hgviewlib.blockmatcher import BlockList +from tortoisehg.hgqt import icon as geticon +from tortoisehg.hgqt.hgfiledialog import FileViewer, FileDiffViewer +from tortoisehg.hgqt.hgmanifestdialog import ManifestViewer +from tortoisehg.hgqt.quickbar import QuickBar +from tortoisehg.hgqt.lexers import get_lexer +from tortoisehg.hgqt.blockmatcher import BlockList    qsci = Qsci.QsciScintilla  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hggraph.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hggraph.py
 
28
29
30
31
 
32
33
34
 
28
29
30
 
31
32
33
34
@@ -28,7 +28,7 @@
   from tortoisehg.util.util import tounicode, isbfile   -import tortoisehg.hgqt.hgviewlib # force apply monkeypatches +import tortoisehg.hgqt # force apply monkeypatches    def diff(repo, ctx1, ctx2=None, files=None):   """
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hgmanifestdialog.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgmanifestdialog.py
 
29
30
31
32
33
34
35
 
 
 
 
36
37
38
 
29
30
31
 
 
 
 
32
33
34
35
36
37
38
@@ -29,10 +29,10 @@
   from tortoisehg.util.util import tounicode   -from tortoisehg.hgqt.hgviewlib import icon as geticon -from tortoisehg.hgqt.hgviewlib.hgdialogmixin import HgDialogMixin -from tortoisehg.hgqt.hgviewlib.hgrepomodel import ManifestModel -from tortoisehg.hgqt.hgviewlib.lexers import get_lexer +from tortoisehg.hgqt import icon as geticon +from tortoisehg.hgqt.hgdialogmixin import HgDialogMixin +from tortoisehg.hgqt.hgrepomodel import ManifestModel +from tortoisehg.hgqt.lexers import get_lexer    connect = QtCore.QObject.connect  disconnect = QtCore.QObject.disconnect
Show Entire File tortoisehg/​hgqt/​hgqv.qrc Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgqv.qrc
(No changes)
Show Entire File tortoisehg/​hgqt/​hgqv.ui Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgqv.ui
(No changes)
Show Entire File tortoisehg/​hgqt/​hgqv_rc.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgqv_rc.py
(No changes)
Show Entire File tortoisehg/​hgqt/​hgqv_ui.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgqv_ui.py
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hgrepomodel.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgrepomodel.py
 
28
29
30
31
32
33
34
35
 
 
 
 
 
36
37
38
 
28
29
30
 
 
 
 
 
31
32
33
34
35
36
37
38
@@ -28,11 +28,11 @@
   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 import icon as geticon -from tortoisehg.hgqt.hgviewlib.decorators import timeit +from tortoisehg.hgqt.hggraph import Graph, ismerge, diff as revdiff +from tortoisehg.hgqt.hggraph import revision_grapher, filelog_grapher +from tortoisehg.hgqt.config import HgConfig +from tortoisehg.hgqt import icon as geticon +from tortoisehg.hgqt.decorators import timeit    from PyQt4 import QtCore, QtGui  connect = QtCore.QObject.connect
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​hgrepoview.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgrepoview.py
 
32
33
34
35
36
37
38
39
 
 
 
 
 
40
41
42
 
467
468
469
470
 
471
472
473
 
32
33
34
 
 
 
 
 
35
36
37
38
39
40
41
42
 
467
468
469
 
470
471
472
473
@@ -32,11 +32,11 @@
   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 import icon as geticon -from tortoisehg.hgqt.hgviewlib.hgmanifestdialog import ManifestViewer -from tortoisehg.hgqt.hgviewlib.quickbar import QuickBar +from tortoisehg.hgqt.decorators import timeit +from tortoisehg.hgqt.config import HgConfig +from tortoisehg.hgqt import icon as geticon +from tortoisehg.hgqt.hgmanifestdialog import ManifestViewer +from tortoisehg.hgqt.quickbar import QuickBar    class GotoQuickBar(QuickBar):   def __init__(self, parent): @@ -467,7 +467,7 @@
 if __name__ == "__main__":   from mercurial import ui, hg   from optparse import OptionParser - from hgviewlib.qt4.hgrepomodel import FileRevModel, HgRepoListModel + from hgrepomodel import FileRevModel, HgRepoListModel   p = OptionParser()   p.add_option('-R', '--root', default='.',   dest='root',
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​hgrepoviewer.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgrepoviewer.py
 
20
21
22
23
24
 
 
25
26
27
28
29
30
31
32
 
 
 
 
 
 
 
33
34
35
 
502
503
504
505
 
506
507
508
 
522
523
524
525
 
526
527
528
 
20
21
22
 
 
23
24
25
 
 
 
 
 
 
 
26
27
28
29
30
31
32
33
34
35
 
502
503
504
 
505
506
507
508
 
522
523
524
 
525
526
527
528
@@ -20,16 +20,16 @@
 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 +from tortoisehg.hgqt.hggraph import diff as revdiff +from tortoisehg.hgqt.decorators import timeit   -from tortoisehg.hgqt.hgviewlib import icon as geticon -from tortoisehg.hgqt.hgviewlib.hgrepomodel import HgRepoListModel, HgFileListModel -from tortoisehg.hgqt.hgviewlib.hgfiledialog import FileViewer, FileDiffViewer -from tortoisehg.hgqt.hgviewlib.hgmanifestdialog import ManifestViewer -from tortoisehg.hgqt.hgviewlib.hgdialogmixin import HgDialogMixin -from tortoisehg.hgqt.hgviewlib.quickbar import FindInGraphlogQuickBar -from tortoisehg.hgqt.hgviewlib.helpviewer import HelpViewer +from tortoisehg.hgqt import icon as geticon +from tortoisehg.hgqt.hgrepomodel import HgRepoListModel, HgFileListModel +from tortoisehg.hgqt.hgfiledialog import FileViewer, FileDiffViewer +from tortoisehg.hgqt.hgmanifestdialog import ManifestViewer +from tortoisehg.hgqt.hgdialogmixin import HgDialogMixin +from tortoisehg.hgqt.quickbar import FindInGraphlogQuickBar +from tortoisehg.hgqt.helpviewer import HelpViewer    from tortoisehg.util import paths   @@ -502,7 +502,7 @@
    def on_about(self, *args):   """ Display about dialog """ - from hgviewlib.__pkginfo__ import modname, version, short_desc, long_desc + from __pkginfo__ import modname, version, short_desc, long_desc   try:   from mercurial.version import get_version   hgversion = get_version() @@ -522,7 +522,7 @@
  w.activateWindow()    def run(ui, *pats, **opts): - from tortoisehg.hgqt.hgviewlib import setup_font_substitutions + from tortoisehg.hgqt import setup_font_substitutions   setup_font_substitutions()     repo = None
Show Entire File tortoisehg/​hgqt/​hgviewhelp.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/hgviewhelp.py
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​README Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/README
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​back.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/back.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​clean.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/clean.svg
(No changes)
tortoisehg/​hgqt/​icons/​close.png Side by side
renamed from tortoisehg/hgqt/hgviewlib/icons/close.png
Removed image
Added image 		Subtracted image Added image
Show Entire File tortoisehg/​hgqt/​icons/​down.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/down.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​find.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/find.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​forward.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/forward.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​goto.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/goto.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​help.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/help.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​left.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/left.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​leftright.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/leftright.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​modified.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/modified.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​mqdiff.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/mqdiff.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​mqdiff_x.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/mqdiff_x.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​mqpatch.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/mqpatch.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​mqpatch_x.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/mqpatch_x.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​quit.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/quit.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​reload.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/reload.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​right.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/right.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​icons/​up.svg Stacked
renamed from tortoisehg/hgqt/hgviewlib/icons/up.svg
(No changes)
Show Entire File tortoisehg/​hgqt/​lexers.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/lexers.py
(No changes)
Show Entire File tortoisehg/​hgqt/​manifestviewer.ui Stacked
renamed from tortoisehg/hgqt/hgviewlib/manifestviewer.ui
(No changes)
Show Entire File tortoisehg/​hgqt/​manifestviewer_ui.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/manifestviewer_ui.py
(No changes)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​quickbar.py Stacked
renamed from tortoisehg/hgqt/hgviewlib/quickbar.py
 
23
24
25
26
 
27
28
29
 
318
319
320
321
 
322
323
324
 
23
24
25
 
26
27
28
29
 
318
319
320
 
321
322
323
324
@@ -23,7 +23,7 @@
   from tortoisehg.util.util import Curry   -from tortoisehg.hgqt.hgviewlib import icon as geticon +from tortoisehg.hgqt import icon as geticon    Qt = QtCore.Qt  connect = QtCore.QObject.connect @@ -318,7 +318,7 @@
   if __name__ == "__main__":   import sys - import hgviewlib # to force importation of resource module w/ icons + # import hgviewlib # to force importation of resource module w/ icons   app = QtGui.QApplication(sys.argv)   root = QtGui.QMainWindow()   w = QtGui.QFrame()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
361
362
363
364
 
365
366
367
 
361
362
363
 
364
365
366
367
@@ -361,7 +361,7 @@
   def log(ui, *pats, **opts):   """Repository Explorer (changelog viewer)""" - from tortoisehg.hgqt.hgviewlib.hgrepoviewer import run + from tortoisehg.hgqt.hgrepoviewer import run   qtrun(run, ui, *pats, **opts)    ### help management, adapted from mercurial.commands.help_()