diff -r bad2e89047e7 -r 7848489bcb92 Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Fri Oct 11 19:51:20 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Sat Oct 12 15:01:28 2013 +0200
@@ -89,13 +89,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()
@@ -132,7 +132,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)
@@ -143,7 +144,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():
