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

thgrepo: move thgrepo.py into tortoisehg/hgqt/

Changeset 0344760a0f89…

Parent acb16e9234ce…

by Steve Borho

Changes to 18 files · Browse files at 0344760a0f89 Showing diff from parent acb16e9234ce Diff from another changeset...

Change 1 of 1 Show Entire File tests/​__init__.py Stacked
 
1
2
3
 
4
5
6
 
1
2
 
3
4
5
6
@@ -1,6 +1,6 @@
 import os, tempfile, shutil  from mercurial import ui, commands, error -from tortoisehg.util import thgrepo +from tortoisehg.hgqt import thgrepo    FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'fixtures')  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​archive.py Stacked
 
17
18
19
20
21
 
 
22
23
24
 
17
18
19
 
 
20
21
22
23
24
@@ -17,8 +17,8 @@
 from mercurial import hg, error    from tortoisehg.hgqt.i18n import _ -from tortoisehg.util import hglib, paths, thgrepo -from tortoisehg.hgqt import cmdui, qtlib +from tortoisehg.util import hglib, paths +from tortoisehg.hgqt import cmdui, qtlib, thgrepo    WD_PARENT = _('= Working Directory Parent =')  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​csinfo.py Stacked
 
14
15
16
17
 
18
19
 
20
21
22
 
14
15
16
 
17
18
 
19
20
21
22
@@ -14,9 +14,9 @@
 from mercurial import error  from mercurial.node import hex   -from tortoisehg.util import hglib, paths, thgrepo +from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib +from tortoisehg.hgqt import qtlib, thgrepo    PANEL_DEFAULT = ('rev', 'summary', 'user', 'dateage', 'branch', 'tags',   'transplant', 'p4', 'svn')
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​guess.py Stacked
 
9
10
11
12
 
13
14
15
 
16
17
18
 
9
10
11
 
12
13
14
 
15
16
17
18
@@ -9,10 +9,10 @@
   from mercurial import hg, ui, mdiff, similar, patch   -from tortoisehg.util import hglib, shlib, paths, thgrepo +from tortoisehg.util import hglib, shlib, paths    from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, htmlui, cmdui +from tortoisehg.hgqt import qtlib, htmlui, cmdui, thgrepo    from PyQt4.QtCore import *  from PyQt4.QtGui import *
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hgignore.py Stacked
 
14
15
16
17
 
18
19
 
20
21
22
 
14
15
16
 
17
18
 
19
20
21
22
@@ -14,9 +14,9 @@
 from mercurial import hg, ui, match, util, error    from tortoisehg.hgqt.i18n import _ -from tortoisehg.util import shlib, hglib, paths, thgrepo +from tortoisehg.util import shlib, hglib, paths   -from tortoisehg.hgqt import qtlib +from tortoisehg.hgqt import qtlib, thgrepo    class HgignoreDialog(QDialog):   'Edit a reposiory .hgignore file'
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
24
25
26
27
 
28
29
30
 
31
32
33
 
24
25
26
 
27
28
29
 
30
31
32
33
@@ -24,10 +24,10 @@
 from PyQt4.QtGui import *  from PyQt4.Qsci import QsciScintilla   -from tortoisehg.util import paths, thgrepo +from tortoisehg.util import paths  from tortoisehg.util.hglib import tounicode   -from tortoisehg.hgqt import qtlib, annotate, status +from tortoisehg.hgqt import qtlib, annotate, status, thgrepo  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt.manifestmodel import ManifestModel  from tortoisehg.hgqt.lexers import get_lexer
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
10
11
12
13
 
14
15
 
16
17
18
 
10
11
12
 
13
14
 
15
16
17
18
@@ -10,9 +10,9 @@
   from mercurial import hg, ui   -from tortoisehg.util import hglib, paths, thgrepo +from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status +from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status, thgrepo    keep = i18n.keepgettext()  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​rename.py Stacked
 
15
16
17
18
19
 
 
20
21
22
 
15
16
17
 
 
18
19
20
21
22
@@ -15,8 +15,8 @@
 from mercurial import hg, ui, util, commands, error    from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import cmdui, qtlib -from tortoisehg.util import hglib, paths, thgrepo +from tortoisehg.hgqt import cmdui, qtlib, thgrepo +from tortoisehg.util import hglib, paths      class RenameDialog(QDialog):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repomodel.py Stacked
 
26
27
28
29
 
30
31
32
 
26
27
28
 
29
30
31
32
@@ -26,7 +26,7 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -from tortoisehg.util.thgrepo import PatchContext +from tortoisehg.hgqt.thgrepo import PatchContext    nullvariant = QVariant()  
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
11
12
13
14
 
15
16
17
 
19
20
21
22
 
23
24
25
 
11
12
13
 
14
15
16
17
 
19
20
21
 
22
23
24
25
@@ -11,7 +11,7 @@
 import binascii  import os   -from tortoisehg.util import thgrepo, shlib, hglib, purge +from tortoisehg.util import shlib, hglib, purge    from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt.qtlib import geticon, getfont, QuestionMsgBox, InfoMsgBox @@ -19,7 +19,7 @@
 from tortoisehg.hgqt.repomodel import HgRepoListModel  from tortoisehg.hgqt.quickbar import FindInGraphlogQuickBar  from tortoisehg.hgqt import cmdui, update, tag, backout, merge, visdiff -from tortoisehg.hgqt import archive, thgimport, thgstrip, run +from tortoisehg.hgqt import archive, thgimport, thgstrip, run, thgrepo    from tortoisehg.hgqt.repoview import HgRepoView  from tortoisehg.hgqt.revdetailswidget import RevDetailsWidget
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
10
11
12
13
 
 
14
15
16
 
10
11
12
 
13
14
15
16
17
@@ -10,7 +10,8 @@
 from mercurial import ui, hg, util, patch, cmdutil, error, mdiff  from mercurial import context, merge, commands, subrepo  from tortoisehg.hgqt import qtlib, htmlui, chunkselect, wctxactions, visdiff -from tortoisehg.util import paths, hglib, thgrepo +from tortoisehg.hgqt import thgrepo +from tortoisehg.util import paths, hglib  from tortoisehg.util.util import xml_escape  from tortoisehg.hgqt.i18n import _  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
15
16
17
18
 
19
20
 
21
22
23
 
15
16
17
 
18
19
 
20
21
22
23
@@ -15,9 +15,9 @@
   from mercurial import hg, ui, url, util, error   -from tortoisehg.util import hglib, thgrepo, wconfig +from tortoisehg.util import hglib, wconfig  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, cmdui +from tortoisehg.hgqt import qtlib, cmdui, thgrepo    # TODO  # Write keyring help, connect to help button
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​tag.py Stacked
 
13
14
15
16
 
17
18
19
 
20
21
22
 
13
14
15
 
16
17
18
 
19
20
21
22
@@ -13,10 +13,10 @@
   from mercurial import hg, ui, error   -from tortoisehg.util import hglib, paths, i18n, thgrepo +from tortoisehg.util import hglib, paths, i18n  from tortoisehg.hgqt.qtlib import getpixmap  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib +from tortoisehg.hgqt import qtlib, thgrepo    keep = i18n.keepgettext()  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thgimport.py Stacked
 
13
14
15
16
 
17
18
 
19
20
21
 
13
14
15
 
16
17
 
18
19
20
21
@@ -13,9 +13,9 @@
   from mercurial import hg, ui, error   -from tortoisehg.util import hglib, paths, thgrepo +from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import cmdui, cslist, qtlib +from tortoisehg.hgqt import cmdui, cslist, qtlib, thgrepo    _FILE_FILTER = "%s;;%s" % (_("Patch files (*.diff *.patch)"),   _("All files (*)"))
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
renamed from tortoisehg/util/thgrepo.py
 
14
15
16
17
 
18
19
20
 
14
15
16
 
17
18
19
20
@@ -14,7 +14,7 @@
 from mercurial import hg, patch, util, error, bundlerepo, ui, extensions  from mercurial.util import propertycache   -from util import hglib +from tortoisehg.util import hglib    _repocache = {}  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thgstrip.py Stacked
 
11
12
13
14
 
15
16
 
17
18
19
 
11
12
13
 
14
15
 
16
17
18
19
@@ -11,9 +11,9 @@
   from mercurial import hg, ui, error   -from tortoisehg.util import hglib, paths, thgrepo +from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import cmdui, cslist, qtlib +from tortoisehg.hgqt import cmdui, cslist, qtlib, thgrepo    class StripDialog(QDialog):   """Dialog to strip changesets"""
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
12
13
14
15
 
16
17
 
18
19
20
 
12
13
14
 
15
16
 
17
18
19
20
@@ -12,9 +12,9 @@
   from mercurial import ui, error   -from tortoisehg.util import hglib, paths, thgrepo +from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import cmdui, csinfo, qtlib +from tortoisehg.hgqt import cmdui, csinfo, qtlib, thgrepo    class UpdateDialog(QDialog):  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
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.error import RepoError   -from tortoisehg.util import paths, thgrepo, hglib +from tortoisehg.util import paths, hglib    #from tortoisehg.hgqt.decorators import timeit   -from tortoisehg.hgqt import repomodel +from tortoisehg.hgqt import repomodel, thgrepo  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt.qtlib import geticon, getfont, configstyles, InfoMsgBox  from tortoisehg.hgqt.repowidget import RepoWidget