Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py

branch
Py2 comp.
changeset 3057
10516539f238
parent 2791
a9577f248f04
parent 3008
7848489bcb92
child 3060
5883ce99ee12
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Fri Oct 18 23:00:41 2013 +0200
@@ -95,13 +95,13 @@
             if procStarted:
                 finished = process.waitForFinished(300000)
                 if finished and process.exitCode() == 0:
-                    output = \
-                        str(process.readAllStandardOutput(), self.__ioEncoding, 'replace')
+                    output = str(process.readAllStandardOutput(),
+                                 self.__ioEncoding, 'replace')
                 else:
                     process.kill()
                     process.waitForFinished()
-                    error = \
-                        str(process.readAllStandardError(), self.__ioEncoding, 'replace')
+                    error = str(process.readAllStandardError(),
+                                self.__ioEncoding, 'replace')
             else:
                 process.kill()
                 process.waitForFinished()
@@ -138,7 +138,8 @@
                 finished = process.waitForFinished(300000)
                 if finished and process.exitCode() == 0:
                     output = str(
-                        process.readAllStandardOutput(), self.__ioEncoding, 'replace')
+                        process.readAllStandardOutput(),
+                        self.__ioEncoding, 'replace')
         
         for line in output.splitlines():
             flag, name = line.split(" ", 1)
@@ -149,7 +150,8 @@
         for name in states:
             try:
                 if self.reportedStates[name] != states[name]:
-                    self.statusList.append("{0} {1}".format(states[name], name))
+                    self.statusList.append(
+                        "{0} {1}".format(states[name], name))
             except KeyError:
                 self.statusList.append("{0} {1}".format(states[name], name))
         for name in self.reportedStates.keys():

eric ide

mercurial