Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Fri Mar 11 08:55:14 2011 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Fri Mar 11 16:51:57 2011 +0100
@@ -13,11 +13,12 @@
 
 import Preferences
 
+
 class HgStatusMonitorThread(VcsStatusMonitorThread):
     """
     Class implementing the VCS status monitor thread class for Mercurial.
     """
-    def __init__(self, interval, project, vcs, parent = None):
+    def __init__(self, interval, project, vcs, parent=None):
         """
         Constructor
         
@@ -48,7 +49,7 @@
             <li>" " path is back at normal</li>
         </ul>
         
-        @return tuple of flag indicating successful operation (boolean) and 
+        @return tuple of flag indicating successful operation (boolean) and
             a status message in case of non successful operation (string)
         """
         self.shouldUpdate = False
@@ -91,7 +92,7 @@
                         for line in output.splitlines():
                             flag, name = line.split(" ", 1)
                             if flag == "U":
-                                states[name] = "Z" # conflict
+                                states[name] = "Z"  # conflict
                 
                 for name in states:
                     try:
@@ -109,8 +110,8 @@
                 process.kill()
                 process.waitForFinished()
                 return False, \
-                       str(process.readAllStandardError(), 
-                            Preferences.getSystem("IOEncoding"), 
+                       str(process.readAllStandardError(),
+                            Preferences.getSystem("IOEncoding"),
                             'replace')
         else:
             process.kill()