Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py

changeset 3302
e92f0dd51979
parent 3190
a9a94491c4fd
child 3484
645c12de6b0c
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sun Feb 23 15:24:28 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sun Feb 23 19:20:43 2014 +0100
@@ -14,7 +14,6 @@
 
 from .Ui_HgQueuesListGuardsDialog import Ui_HgQueuesListGuardsDialog
 
-import Preferences
 import UI.PixmapCache
 
 
@@ -88,8 +87,7 @@
         self.guardsList.clear()
         self.patchNameLabel.setText("")
         
-        args = []
-        args.append("qguard")
+        args = self.vcs.initCommand("qguard")
         if patch:
             args.append(patch)
         
@@ -97,7 +95,6 @@
         if self.__hgClient:
             output = self.__hgClient.runcommand(args)[0].strip()
         else:
-            ioEncoding = Preferences.getSystem("IOEncoding")
             process = QProcess()
             process.setWorkingDirectory(self.__repodir)
             process.start('hg', args)
@@ -105,9 +102,8 @@
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
-                    output = \
-                        str(process.readAllStandardOutput(),
-                            ioEncoding, 'replace').strip()
+                    output = str(process.readAllStandardOutput(),
+                                 self.vcs.getEncoding(), 'replace').strip()
         
         if output:
             patchName, guards = output.split(":", 1)

eric ide

mercurial