Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py

branch
Py2 comp.
changeset 3060
5883ce99ee12
parent 3058
0a02c433f52d
parent 3037
a417a0670a36
child 3145
a9de05d4a22f
equal deleted inserted replaced
3058:0a02c433f52d 3060:5883ce99ee12
234 """ 234 """
235 self.process.setReadChannel(QProcess.StandardOutput) 235 self.process.setReadChannel(QProcess.StandardOutput)
236 236
237 while self.process.canReadLine(): 237 while self.process.canReadLine():
238 line = str(self.process.readLine(), 238 line = str(self.process.readLine(),
239 Preferences.getSystem("IOEncoding"), 239 Preferences.getSystem("IOEncoding"),
240 'replace') 240 'replace')
241 self.buf.append(line) 241 self.buf.append(line)
242 if self.rx_rev.exactMatch(line): 242 if self.rx_rev.exactMatch(line):
243 ver = self.rx_rev.cap(1) 243 ver = self.rx_rev.cap(1)
244 # save revision number for later use 244 # save revision number for later use
245 self.revisions.append(ver) 245 self.revisions.append(ver)
256 error pane. 256 error pane.
257 """ 257 """
258 if self.process is not None: 258 if self.process is not None:
259 self.errorGroup.show() 259 self.errorGroup.show()
260 s = str(self.process.readAllStandardError(), 260 s = str(self.process.readAllStandardError(),
261 Preferences.getSystem("IOEncoding"), 261 Preferences.getSystem("IOEncoding"),
262 'replace') 262 'replace')
263 self.errors.insertPlainText(s) 263 self.errors.insertPlainText(s)
264 self.errors.ensureCursorVisible() 264 self.errors.ensureCursorVisible()
265 265
266 def __sourceChanged(self, url): 266 def __sourceChanged(self, url):
267 """ 267 """

eric ide

mercurial