--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Nov 03 15:58:22 2013 +0100 @@ -16,7 +16,7 @@ import os from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ - QSize, QPoint + QSize, QPoint from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ QTreeWidgetItem, QApplication, QCursor, QLineEdit, QColor, \ QPixmap, QPainter, QPen, QBrush, QIcon @@ -939,8 +939,8 @@ while self.process.canReadLine(): line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), - 'replace') + Preferences.getSystem("IOEncoding"), + 'replace') self.buf.append(line) def __readStderr(self): @@ -952,8 +952,8 @@ """ if self.process is not None: s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), - 'replace') + Preferences.getSystem("IOEncoding"), + 'replace') self.__showError(s) def __showError(self, out): @@ -1047,8 +1047,8 @@ # step 2: set the status of the phase button if public == 0 and \ - ((secret > 0 and draft == 0) or \ - (secret == 0 and draft > 0)): + ((secret > 0 and draft == 0) or + (secret == 0 and draft > 0)): self.phaseButton.setEnabled(True) else: self.phaseButton.setEnabled(False) @@ -1259,8 +1259,8 @@ topItem = self.logTree.topLevelItem(topIndex) if topItem.text(self.DateColumn) <= to_ and \ topItem.text(self.DateColumn) >= from_ and \ - (branch == self.__allBranchesFilter or \ - topItem.text(self.BranchColumn) in \ + (branch == self.__allBranchesFilter or + topItem.text(self.BranchColumn) in [branch, closedBranch]) and \ searchRx.indexIn(topItem.text(fieldIndex)) > -1: topItem.setHidden(False)