Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Sun Feb 23 15:24:28 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Sun Feb 23 19:20:43 2014 +0100
@@ -17,8 +17,6 @@
 
 from .Ui_HgBookmarksInOutDialog import Ui_HgBookmarksInOutDialog
 
-import Preferences
-
 
 class HgBookmarksInOutDialog(QDialog, Ui_HgBookmarksInOutDialog):
     """
@@ -106,11 +104,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')
@@ -236,9 +233,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):
@@ -263,8 +258,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):