Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py

changeset 3302
e92f0dd51979
parent 3190
a9a94491c4fd
child 3315
bd1a25ead18d
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sun Feb 23 15:24:28 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sun Feb 23 19:20:43 2014 +0100
@@ -218,9 +218,7 @@
         else:
             self.setWindowTitle(self.tr('Mercurial Status'))
         
-        args = []
-        args.append('status')
-        self.vcs.addArguments(args, self.vcs.options['global'])
+        args = self.vcs.initCommand("status")
         if self.__mq:
             args.append('--mq')
             if isinstance(fn, list):
@@ -228,8 +226,6 @@
             else:
                 self.dname, fname = self.vcs.splitPath(fn)
         else:
-            self.vcs.addArguments(args, self.vcs.options['status'])
-            
             if self.vcs.hasSubrepositories():
                 args.append("--subrepos")
             
@@ -359,10 +355,8 @@
             self.process.setReadChannel(QProcess.StandardOutput)
             
             while self.process.canReadLine():
-                line = str(
-                    self.process.readLine(),
-                    Preferences.getSystem("IOEncoding"),
-                    'replace')
+                line = str(self.process.readLine(), self.vcs.getEncoding(),
+                           'replace')
                 self.__processOutputLine(line)
     
     def __processOutputLine(self, line):
@@ -384,8 +378,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):

eric ide

mercurial