diff -r 96232974dcdb -r 645c12de6b0c Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Sun Mar 30 22:00:14 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Thu Apr 03 23:05:31 2014 +0200
@@ -9,8 +9,8 @@
from __future__ import unicode_literals
try:
- str = unicode # __IGNORE_WARNING__
-except (NameError):
+ str = unicode
+except NameError:
pass
import os
@@ -23,8 +23,6 @@
from .Ui_HgBookmarksInOutDialog import Ui_HgBookmarksInOutDialog
-import Preferences
-
class HgBookmarksInOutDialog(QDialog, Ui_HgBookmarksInOutDialog):
"""
@@ -53,9 +51,9 @@
if mode not in [self.INCOMING, self.OUTGOING]:
raise ValueError("Bad value for mode")
if mode == self.INCOMING:
- self.setWindowTitle(self.trUtf8("Mercurial Incoming Bookmarks"))
+ self.setWindowTitle(self.tr("Mercurial Incoming Bookmarks"))
elif mode == self.OUTGOING:
- self.setWindowTitle(self.trUtf8("Mercurial Outgoing Bookmarks"))
+ self.setWindowTitle(self.tr("Mercurial Outgoing Bookmarks"))
self.process = QProcess()
self.vcs = vcs
@@ -112,11 +110,10 @@
if os.path.splitdrive(repodir)[1] == os.sep:
return
- args = []
if self.mode == self.INCOMING:
- args.append('incoming')
+ args = self.vcs.initCommand("incoming")
elif self.mode == self.OUTGOING:
- args.append('outgoing')
+ args = self.vcs.initCommand("outgoing")
else:
raise ValueError("Bad value for mode")
args.append('--bookmarks')
@@ -145,8 +142,8 @@
self.inputGroup.hide()
E5MessageBox.critical(
self,
- self.trUtf8('Process Generation Error'),
- self.trUtf8(
+ self.tr('Process Generation Error'),
+ self.tr(
'The process {0} could not be started. '
'Ensure, that it is in the search path.'
).format('hg'))
@@ -178,7 +175,7 @@
if self.bookmarksList.topLevelItemCount() == 0:
# no bookmarks defined
- self.__generateItem(self.trUtf8("no bookmarks found"), "")
+ self.__generateItem(self.tr("no bookmarks found"), "")
self.__resizeColumns()
self.__resort()
@@ -242,9 +239,7 @@
self.process.setReadChannel(QProcess.StandardOutput)
while self.process.canReadLine():
- s = str(self.process.readLine(),
- Preferences.getSystem("IOEncoding"),
- 'replace')
+ s = str(self.process.readLine(), self.vcs.getEncoding(), 'replace')
self.__processOutputLine(s)
def __processOutputLine(self, line):
@@ -269,8 +264,7 @@
"""
if self.process is not None:
s = str(self.process.readAllStandardError(),
- Preferences.getSystem("IOEncoding"),
- 'replace')
+ self.vcs.getEncoding(), 'replace')
self.__showError(s)
def __showError(self, out):
