eric: comparison Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

-:ef6102d5fefe
+:b48ce064b224
 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
 self.filesTree.headerItem().setText(self.filesTree.columnCount(), "")
 self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder)
+self.refreshButton = \
+self.buttonBox.addButton(self.trUtf8("&Refresh"), QDialogButtonBox.ActionRole)
+self.refreshButton.setToolTip(
+self.trUtf8("Press to refresh the list of changesets"))
+self.refreshButton.setEnabled(False)
 self.vcs = vcs
 if mode in ("log", "incoming", "outgoing"):
 self.commandMode = mode
 else:
 self.commandMode = "log"
 self.bundle = bundle
-self.__maxDate = QDate()
+self.__initData()
-self.__minDate = QDate()
-self.__filterLogsEnabled = True
+self.__allBranchesFilter = self.trUtf8("All")
 self.fromDate.setDisplayFormat("yyyy-MM-dd")
 self.toDate.setDisplayFormat("yyyy-MM-dd")
 self.fromDate.setDate(QDate.currentDate())
 self.toDate.setDate(QDate.currentDate())
 'A': self.trUtf8('Added'),
 'D': self.trUtf8('Deleted'),
 'M': self.trUtf8('Modified'),
 }
+self.__dotRadius = 8
+self.__rowHeight = 20
+self.logTree.setIconSize(
+QSize(100 * self.__rowHeight, self.__rowHeight))
+if self.vcs.versionStr >= "1.8":
+self.logTree.headerItem().setText(self.logTree.columnCount(),
+self.trUtf8("Bookmarks"))
+def __initData(self):
+"""
+Private method to (re-)initialize some data.
+"""
+self.__maxDate = QDate()
+self.__minDate = QDate()
+self.__filterLogsEnabled = True
 self.buf = []        # buffer for stdout
 self.diff = None
 self.__started = False
 self.__lastRev = 0
 self.projectMode = False
 # attributes to store log graph data
 self.__revs = []
 self.__revColors = {}
 self.__revColor = 0
-self.__dotRadius = 8
-self.__rowHeight = 20
 self.__branchColors = {}
-self.__allBranchesFilter = self.trUtf8("All")
-self.logTree.setIconSize(
-QSize(100 * self.__rowHeight, self.__rowHeight))
-if self.vcs.versionStr >= "1.8":
-self.logTree.headerItem().setText(self.logTree.columnCount(),
-self.trUtf8("Bookmarks"))
 self.__projectRevision = -1
 def closeEvent(self, e):
 """
 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
 self.inputGroup.setEnabled(False)
 self.inputGroup.hide()
+self.refreshButton.setEnabled(True)
 def __processBuffer(self):
 """
 Private method to process the buffered output of the hg log command.
 """
 if button == self.buttonBox.button(QDialogButtonBox.Close):
 self.close()
 elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
 self.cancelled = True
 self.__finish()
+elif button == self.refreshButton:
+self.on_refreshButton_clicked()
 def __updateDiffButtons(self):
 """
 Private slot to update the enabled status of the diff buttons.
 """
 selectionLength = len(self.logTree.selectedItems())
 if selectionLength <= 1:
 current = self.logTree.currentItem()
-parents = current.data(0, self.__parentsRole)
+if current is None:
-self.diffP1Button.setEnabled(len(parents) > 0)
+self.diffP1Button.setEnabled(False)
-self.diffP2Button.setEnabled(len(parents) > 1)
+self.diffP2Button.setEnabled(False)
+else:
+parents = current.data(0, self.__parentsRole)
+self.diffP1Button.setEnabled(len(parents) > 0)
+self.diffP2Button.setEnabled(len(parents) > 1)
 self.diffRevisionsButton.setEnabled(False)
 elif selectionLength == 2:
 self.diffP1Button.setEnabled(False)
 self.diffP2Button.setEnabled(False)
 @param current reference to the new current item (QTreeWidgetItem)
 @param previous reference to the old current item (QTreeWidgetItem)
 """
 self.messageEdit.clear()
-for line in current.data(0, self.__messageRole):
-self.messageEdit.append(line.strip())
 self.filesTree.clear()
-changes = current.data(0, self.__changesRole)
-if len(changes) > 0:
+if current is not None:
-for change in changes:
+for line in current.data(0, self.__messageRole):
-self.__generateFileItem(
+self.messageEdit.append(line.strip())
-change["action"], change["path"], change["copyfrom"])
-self.__resizeColumnsFiles()
+changes = current.data(0, self.__changesRole)
-self.__resortFiles()
+if len(changes) > 0:
+for change in changes:
+self.__generateFileItem(
+change["action"], change["path"], change["copyfrom"])
+self.__resizeColumnsFiles()
+self.__resortFiles()
 self.__updateDiffButtons()
 @pyqtSlot()
 def on_logTree_itemSelectionChanged(self):
 self.vcs.getPlugin().setPreferences("StopLogOnCopy",
 self.stopCheckBox.isChecked())
 self.nextButton.setEnabled(True)
 self.limitSpinBox.setEnabled(True)
+@pyqtSlot()
+def on_refreshButton_clicked(self):
+"""
+Private slot to refresh the log.
+"""
+self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
+self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
+self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+self.inputGroup.setEnabled(True)
+self.inputGroup.show()
+self.refreshButton.setEnabled(False)
+self.__initData()
+self.start(self.filename)
 def on_passwordCheckBox_toggled(self, isOn):
 """
 Private slot to handle the password checkbox toggled.
 @param isOn flag indicating the status of the check box (boolean)

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py