Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py

changeset 3302
e92f0dd51979
parent 3190
a9a94491c4fd
child 3408
b6e6a7062d12
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Sun Feb 23 15:24:28 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Sun Feb 23 19:20:43 2014 +0100
@@ -13,8 +13,6 @@
 
 from .Ui_HgQueuesQueueManagementDialog import Ui_HgQueuesQueueManagementDialog
 
-import Preferences
-
 
 class HgQueuesQueueManagementDialog(QDialog, Ui_HgQueuesQueueManagementDialog):
     """
@@ -51,6 +49,7 @@
         self.__repodir = repodir
         self.__suppressActive = suppressActive
         self.__hgClient = vcs.getClient()
+        self.vcs = vcs
         
         self.inputFrame.setHidden(
             mode != HgQueuesQueueManagementDialog.NAME_INPUT)
@@ -93,15 +92,13 @@
         queuesList = []
         activeQueue = ""
         
-        args = []
-        args.append("qqueue")
+        args = self.vcs.initCommand("qqueue")
         args.append("--list")
         
         output = ""
         if self.__hgClient:
             output = self.__hgClient.runcommand(args)[0]
         else:
-            ioEncoding = Preferences.getSystem("IOEncoding")
             process = QProcess()
             process.setWorkingDirectory(self.__repodir)
             process.start('hg', args)
@@ -109,8 +106,8 @@
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
-                    output = str(
-                        process.readAllStandardOutput(), ioEncoding, 'replace')
+                    output = str(process.readAllStandardOutput(),
+                                 self.vcs.getEncoding(), 'replace')
         
         for queue in output.splitlines():
             queue = queue.strip()

eric ide

mercurial