Changeset 00148f902968…
Parent 3b71230d68f2…
by
Changes to 14 files · Browse files at 00148f902968 Showing diff from parent 3b71230d68f2 Diff from another changeset...
@@ -157,8 +157,7 @@ self.update_path()
# dialog setting
- reponame = hglib.get_reponame(self.repo)
- self.setWindowTitle(_('Archive - %s') % hglib.tounicode(reponame))
+ self.setWindowTitle(_('Archive - %s') % self.repo.displayname)
self.setWindowIcon(qtlib.geticon('archive'))
self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
self.setLayout(self.vbox)
|
@@ -104,9 +104,8 @@ self.setMinimumWidth(480)
self.setMaximumHeight(800)
self.resize(0, 340)
- reponame = hglib.get_reponame(self.repo)
- self.setWindowTitle(_("Backout '%s' - %s") \
- % (revhex, hglib.tounicode(reponame)))
+ self.setWindowTitle(_("Backout '%s' - %s") % (revhex,
+ self.repo.displayname))
self.merge_chk.setChecked(bool(opts.get('merge')))
|
@@ -761,8 +761,7 @@ self.bb = bb
layout.addWidget(bb)
- name = hglib.get_reponame(self.repo)
- self.setWindowTitle('%s - commit details' % name)
+ self.setWindowTitle('%s - commit details' % self.repo.displayname)
def newPatch(self):
name = hglib.fromunicode(self.patchle.text())
@@ -917,8 +916,7 @@ commit.commitComplete.connect(self.postcommit)
commit.commitButtonName.connect(self.setButtonName)
- name = hglib.get_reponame(commit.repo)
- self.setWindowTitle('%s - commit' % name)
+ self.setWindowTitle('%s - commit' % commit.repo.displayname)
self.commit = commit
self.commit.reload()
|
@@ -34,8 +34,7 @@ self.pats = pats
self.thread = None
- reponame = hglib.get_reponame(repo)
- self.setWindowTitle(_('Detect Copies/Renames in %s') % reponame)
+ self.setWindowTitle(_('Detect Copies/Renames in %s') % repo.displayname)
self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
layout = QVBoxLayout()
|
@@ -36,7 +36,7 @@
self.repo = repo
self.pats = pats
- self.setWindowTitle(_('Ignore filter - %s') % hglib.get_reponame(repo))
+ self.setWindowTitle(_('Ignore filter - %s') % repo.displayname)
vbox = QVBoxLayout()
self.setLayout(vbox)
|
@@ -39,8 +39,7 @@ self.other = str(other)
self.local = str(self.repo.parents()[0].rev())
- reponame = hglib.get_reponame(self.repo)
- self.setWindowTitle(_('Merge - %s') % hglib.tounicode(reponame))
+ self.setWindowTitle(_('Merge - %s') % self.repo.displayname)
self.setWindowIcon(qtlib.geticon('merge'))
self.setMinimumSize(600, 512)
self.setOption(QWizard.DisabledBackButtonOnLastPage, True)
|
@@ -15,7 +15,7 @@ from tortoisehg.hgqt.i18n import _
from tortoisehg.util import hglib, shlib, paths
-from tortoisehg.hgqt import qtlib, status, cmdui
+from tortoisehg.hgqt import qtlib, status, cmdui, thgrepo
LABELS = { 'add': (_('Checkmark files to add'), _('Add')),
'forget': (_('Checkmark files to forget'), _('Forget')),
@@ -35,10 +35,10 @@ command = 'remove'
self.command = command
- repo = hg.repository(ui.ui(), path=paths.find_root())
+ repo = thgrepo.repository(path=paths.find_root())
assert repo
os.chdir(repo.root)
- self.setWindowTitle('%s - hg %s' % (hglib.get_reponame(repo), command))
+ self.setWindowTitle('%s - hg %s' % repo.displayname, command))
layout = QVBoxLayout()
self.setLayout(layout)
|
@@ -152,7 +152,7 @@
def setRenameCopy(self):
if self.windowTitle() == '':
- self.reponame = hglib.tounicode(hglib.get_reponame(self.repo))
+ self.reponame = self.repo.displayname
if self.copy_chk.isChecked():
wt = (_('Copy - %s') % self.reponame)
self.rename_btn.setText(_('Copy'))
|
@@ -198,11 +198,9 @@
def getTitle(self):
if self.pats:
- return hglib.tounicode(_('%s - status (selection filtered)') %
- hglib.get_reponame(self.repo))
+ return _('%s - status (selection filtered)') % self.repo.displayname
else:
- return hglib.tounicode(_('%s - status') %
- hglib.get_reponame(self.repo))
+ return _('%s - status') % self.repo.displayname
def restoreState(self, data):
return self.split.restoreState(data)
|
@@ -142,8 +142,7 @@ # dialog setting
self.setLayout(base)
self.layout().setSizeConstraint(QLayout.SetFixedSize)
- reponame = hglib.get_reponame(self.repo)
- self.setWindowTitle(_('Tag - %s') % hglib.tounicode(reponame))
+ self.setWindowTitle(_('Tag - %s') % self.repo.displayname)
self.setWindowIcon(qtlib.geticon('tag'))
# prepare to show
|
@@ -119,8 +119,7 @@ # dialog setting
self.setLayout(box)
self.layout().setSizeConstraint(QLayout.SetMinAndMaxSize)
- reponame = hglib.get_reponame(self.repo)
- self.setWindowTitle(_('Import - %s') % hglib.tounicode(reponame))
+ self.setWindowTitle(_('Import - %s') % self.repo.displayname)
#self.setWindowIcon(qtlib.geticon('import'))
# prepare to show
|
@@ -122,8 +122,7 @@ # dialog setting
self.setLayout(box)
self.layout().setSizeConstraint(QLayout.SetMinAndMaxSize)
- reponame = hglib.get_reponame(self.repo)
- self.setWindowTitle(_('Strip - %s') % hglib.tounicode(reponame))
+ self.setWindowTitle(_('Strip - %s') % self.repo.displayname)
#self.setWindowIcon(qtlib.geticon('strip'))
# prepare to show
|
@@ -140,8 +140,7 @@ # dialog setting
self.setLayout(box)
self.layout().setSizeConstraint(QLayout.SetFixedSize)
- reponame = hglib.get_reponame(self.repo)
- self.setWindowTitle(_('Update - %s') % hglib.tounicode(reponame))
+ self.setWindowTitle(_('Update - %s') % self.repo.displayname)
self.setWindowIcon(qtlib.geticon('update'))
# prepare to show
|
@@ -17,7 +17,7 @@
from tortoisehg.hgqt.i18n import _
from tortoisehg.util import hglib, paths
-from tortoisehg.hgqt import qtlib
+from tortoisehg.hgqt import qtlib, thgrepo
from PyQt4 import QtCore
from PyQt4 import QtGui
@@ -276,7 +276,7 @@ replace = dict(parent=dir1a, parent1=dir1a, parent2=dir1b,
plabel1=label1a, plabel2=label1b,
phash1=str(ctx1a), phash2=str(ctx1b),
- repo=hglib.get_reponame(repo),
+ repo=hglib.fromunicode(repo.displayname),
clabel=label2, child=dir2, chash=str(ctx2))
launchtool(diffcmd, args, replace, True)
@@ -326,7 +326,7 @@ title += _(' filtered')
self.resize(400, 250)
- self.reponame = hglib.get_reponame(repo)
+ self.reponame = hglib.fromunicode(repo.displayname)
self.ctxs = (ctx1a, ctx1b, ctx2)
self.copies = cpy
@@ -563,7 +563,7 @@def run(ui, *pats, **opts):
try:
path = opts.get('bundle') or paths.find_root()
- repo = hg.repository(ui, path=path)
+ repo = thgrepo.repository(ui, path=path)
except error.RepoError:
ui.warn(_('No repository found here') + '\n')
return None
|
Loading...