Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sun Feb 23 15:24:28 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sun Feb 23 19:20:43 2014 +0100
@@ -110,14 +110,11 @@
         
         self.filesCombo.clear()
         
-        args = []
         if qdiff:
-            args.append('qdiff')
+            args = self.vcs.initCommand("qdiff")
             self.setWindowTitle(self.tr("Patch Contents"))
         else:
-            args.append('diff')
-            self.vcs.addArguments(args, self.vcs.options['global'])
-            self.vcs.addArguments(args, self.vcs.options['diff'])
+            args = self.vcs.initCommand("diff")
             
             if self.vcs.hasSubrepositories():
                 args.append("--subrepos")
@@ -312,8 +309,7 @@
         self.process.setReadChannel(QProcess.StandardOutput)
         
         while self.process.canReadLine():
-            line = str(self.process.readLine(),
-                       Preferences.getSystem("IOEncoding"),
+            line = str(self.process.readLine(), self.vcs.getEncoding(),
                        'replace')
             self.__processOutputLine(line)
     
@@ -326,8 +322,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):