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

-:99ec13e695f9
+:15b78ac687fb
 self.tr("&Refresh"), QDialogButtonBox.ActionRole)
 self.refreshButton.setToolTip(
 self.tr("Press to refresh the list of changesets"))
 self.refreshButton.setEnabled(False)
+self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png"))
+self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png"))
+self.__findBackwards = False
+self.modeComboBox.addItem(self.tr("Find"), "find")
+self.modeComboBox.addItem(self.tr("Filter"), "filter")
+self.fieldCombo.addItem(self.tr("Revision"), "revision")
+self.fieldCombo.addItem(self.tr("Author"), "author")
+self.fieldCombo.addItem(self.tr("Message"), "message")
 self.vcs = vcs
 if mode in ("log", "incoming", "outgoing"):
 self.commandMode = mode
 self.initialCommandMode = mode
 else:
 "<table>"
 "<tr><td><b>Revision</b></td><td>{0}</td></tr>"
 "<tr><td><b>Date</b></td><td>{1}</td></tr>"
 "<tr><td><b>Author</b></td><td>{2}</td></tr>"
 "<tr><td><b>Branch</b></td><td>{3}</td></tr>"
-"<tr><td><b>Tags</b></td><td>{4}</td></tr>"
+"<tr><td><b>Parents</b></td><td>{4}</td></tr>"
-"<tr><td><b>Bookmarks</b></td><td>{5}</td></tr>"
+"{5}"
-"<tr><td><b>Parents</b></td><td>{6}</td></tr>"
 "</table>"
+)
+self.__tagsTemplate = self.tr(
+"<tr><td><b>Tags</b></td><td>{0}</td></tr>"
+)
+self.__bookmarksTemplate = self.tr(
+"<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>"
 )
 self.__bundle = ""
 self.__filename = ""
 self.__isFile = False
 Private method to reset the user interface.
 """
 self.branchCombo.clear()
 self.fromDate.setDate(QDate.currentDate())
 self.toDate.setDate(QDate.currentDate())
-self.fieldCombo.setCurrentIndex(self.fieldCombo.findText(
+self.fieldCombo.setCurrentIndex(self.fieldCombo.findData("message"))
-self.tr("Message")))
 self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences(
 "LogLimit"))
 self.stopCheckBox.setChecked(self.vcs.getPlugin().getPreferences(
 "StopLogOnCopy"))
 [self.__allBranchesFilter] + sorted(self.__branchColors.keys()))
 self.branchCombo.setCurrentIndex(
 self.branchCombo.findText(branchFilter))
 self.__filterLogsEnabled = True
-self.__filterLogs()
+if self.__actionMode() == "filter":
+self.__filterLogs()
 self.__updateDiffButtons()
 self.__updateToolMenuActions()
 # restore current item
 if self.__currentRevision:
 self.detailsEdit.clear()
 self.messageEdit.clear()
 self.filesTree.clear()
 if itm is not None:
+if itm.text(self.TagsColumn):
+tagsStr = self.__tagsTemplate.format(itm.text(self.TagsColumn))
+else:
+tagsStr = ""
+if itm.text(self.BookmarksColumn):
+bookmarksStr = self.__bookmarksTemplate.format(
+itm.text(self.BookmarksColumn))
+else:
+bookmarksStr = ""
 self.detailsEdit.setHtml(self.__detailsTemplate.format(
 itm.text(self.RevisionColumn),
 itm.text(self.DateColumn),
 itm.text(self.AuthorColumn),
 itm.text(self.BranchColumn).replace(
 self.ClosedIndicator, ""),
-itm.text(self.TagsColumn),
-itm.text(self.BookmarksColumn),
 ", ".join(
 [str(x) for x in itm.data(0, self.__parentsRole)]
 ),
+tagsStr + bookmarksStr,
 ))
 for line in itm.data(0, self.__messageRole):
 self.messageEdit.append(line.strip())
 """
 Private slot called, when the from date changes.
 @param date new date (QDate)
 """
-self.__filterLogs()
+if self.__actionMode() == "filter":
+self.__filterLogs()
 @pyqtSlot(QDate)
 def on_toDate_dateChanged(self, date):
 """
 Private slot called, when the from date changes.
 @param date new date (QDate)
 """
-self.__filterLogs()
+if self.__actionMode() == "filter":
+self.__filterLogs()
 @pyqtSlot(str)
 def on_branchCombo_activated(self, txt):
 """
 Private slot called, when a new branch is selected.
 @param txt text of the selected branch (string)
 """
-self.__filterLogs()
+if self.__actionMode() == "filter":
+self.__filterLogs()
 @pyqtSlot(str)
 def on_fieldCombo_activated(self, txt):
 """
 Private slot called, when a new filter field is selected.
 @param txt text of the selected field (string)
 """
-self.__filterLogs()
+if self.__actionMode() == "filter":
+self.__filterLogs()
 @pyqtSlot(str)
 def on_rxEdit_textChanged(self, txt):
 """
 Private slot called, when a filter expression is entered.
 @param txt filter expression (string)
 """
-self.__filterLogs()
+if self.__actionMode() == "filter":
+self.__filterLogs()
+elif self.__actionMode() == "find":
+self.__findItem(self.__findBackwards, interactive=True)
+@pyqtSlot()
+def on_rxEdit_returnPressed(self):
+"""
+Private slot handling a press of the Return key in the rxEdit input.
+"""
+if self.__actionMode() == "find":
+self.__findItem(self.__findBackwards, interactive=True)
 def __filterLogs(self):
 """
 Private method to filter the log entries.
 """
 if self.__filterLogsEnabled:
 from_ = self.fromDate.date().toString("yyyy-MM-dd")
 to_ = self.toDate.date().addDays(1).toString("yyyy-MM-dd")
 branch = self.branchCombo.currentText()
 closedBranch = branch + '--'
+fieldIndex, searchRx = self.__prepareFieldSearch()
-txt = self.fieldCombo.currentText()
-if txt == self.tr("Author"):
+##            txt = self.fieldCombo.currentText()
-fieldIndex = self.AuthorColumn
+##            if txt == self.tr("Author"):
-searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive)
+##                fieldIndex = self.AuthorColumn
-elif txt == self.tr("Revision"):
+##                searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive)
-fieldIndex = self.RevisionColumn
+##            elif txt == self.tr("Revision"):
-txt = self.rxEdit.text()
+##                fieldIndex = self.RevisionColumn
-if txt.startswith("^"):
+##                txt = self.rxEdit.text()
-searchRx = QRegExp("^\s*{0}".format(txt[1:]),
+##                if txt.startswith("^"):
-Qt.CaseInsensitive)
+##                    searchRx = QRegExp("^\s*{0}".format(txt[1:]),
-else:
+##                                       Qt.CaseInsensitive)
-searchRx = QRegExp(txt, Qt.CaseInsensitive)
+##                else:
-else:
+##                    searchRx = QRegExp(txt, Qt.CaseInsensitive)
-fieldIndex = self.MessageColumn
+##            else:
-searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive)
+##                fieldIndex = self.MessageColumn
+##                searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive)
+##
+visibleItemCount = self.logTree.topLevelItemCount()
 currentItem = self.logTree.currentItem()
 for topIndex in range(self.logTree.topLevelItemCount()):
 topItem = self.logTree.topLevelItem(topIndex)
+if fieldIndex == self.MessageColumn:
+# Find based on complete message text
+txt = "\n".join(topItem.data(0, self.__messageRole))
+else:
+txt = topItem.text(fieldIndex)
 if topItem.text(self.DateColumn) <= to_ and \
 topItem.text(self.DateColumn) >= from_ and \
 (branch == self.__allBranchesFilter or
 topItem.text(self.BranchColumn) in
 [branch, closedBranch]) and \
-searchRx.indexIn(topItem.text(fieldIndex)) > -1:
+searchRx.indexIn(txt) > -1:
 topItem.setHidden(False)
 if topItem is currentItem:
 self.on_logTree_currentItemChanged(topItem, None)
 else:
 topItem.setHidden(True)
 if topItem is currentItem:
 self.messageEdit.clear()
 self.filesTree.clear()
+visibleItemCount -= 1
+self.logTree.header().setSectionHidden(
+self.IconColumn,
+visibleItemCount != self.logTree.topLevelItemCount())
+def __prepareFieldSearch(self):
+"""
+Private slot to prepare the filed search data.
+@return tuple of field index and search expression (integer, string)
+"""
+txt = self.fieldCombo.itemData(self.fieldCombo.currentIndex())
+if txt == "author":
+fieldIndex = self.AuthorColumn
+searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive)
+elif txt == "revision":
+fieldIndex = self.RevisionColumn
+txt = self.rxEdit.text()
+if txt.startswith("^"):
+searchRx = QRegExp("^\s*{0}".format(txt[1:]),
+Qt.CaseInsensitive)
+else:
+searchRx = QRegExp(txt, Qt.CaseInsensitive)
+else:
+fieldIndex = self.MessageColumn
+searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive)
+return fieldIndex, searchRx
 @pyqtSlot(bool)
 def on_stopCheckBox_clicked(self, checked):
 """
 Private slot called, when the stop on copy/move checkbox is clicked.
 revs.append(rev)
 if revs:
 self.vcs.getExtensionObject("largefiles").hgLfPull(
 self.repodir, revisions=revs)
+def __actionMode(self):
+"""
+Private method to get the selected action mode.
+@return selected action mode (string, one of filter or find)
+"""
+return self.modeComboBox.itemData(
+self.modeComboBox.currentIndex())
+@pyqtSlot(int)
+def on_modeComboBox_currentIndexChanged(self, index):
+"""
+Private slot to react on mode changes.
+"""
+mode = self.modeComboBox.itemData(index)
+findMode = mode == "find"
+filterMode = mode == "filter"
+self.fromDate.setEnabled(filterMode)
+self.toDate.setEnabled(filterMode)
+self.branchCombo.setEnabled(filterMode)
+self.findPrevButton.setVisible(findMode)
+self.findNextButton.setVisible(findMode)
+if findMode:
+for topIndex in range(self.logTree.topLevelItemCount()):
+self.logTree.topLevelItem(topIndex).setHidden(False)
+self.logTree.header().setSectionHidden(self.IconColumn, False)
+elif filterMode:
+self.__filterLogs()
+@pyqtSlot()
+def on_findPrevButton_clicked(self):
+"""
+Private slot to find the previous item matching the entered criteria.
+"""
+self.__findItem(True)
+@pyqtSlot()
+def on_findNextButton_clicked(self):
+"""
+Private slot to find the next item matching the entered criteria.
+"""
+self.__findItem(False)
+def __findItem(self, backwards=False, interactive=False):
+"""
+Private slot to find an item matching the entered criteria.
+@param backwards flag indicating to search backwards (boolean)
+@param interactive flag indicating an interactive search (boolean)
+"""
+self.__findBackwards = backwards
+fieldIndex, searchRx = self.__prepareFieldSearch()
+currentIndex = self.logTree.indexOfTopLevelItem(
+self.logTree.currentItem())
+if backwards:
+if interactive:
+indexes = range(currentIndex, -1, -1)
+else:
+indexes = range(currentIndex - 1, -1, -1)
+else:
+if interactive:
+indexes = range(currentIndex, self.logTree.topLevelItemCount())
+else:
+indexes = range(currentIndex + 1,
+self.logTree.topLevelItemCount())
+for index in indexes:
+topItem = self.logTree.topLevelItem(index)
+if fieldIndex == self.MessageColumn:
+# Find based on complete message text
+txt = "\n".join(topItem.data(0, self.__messageRole))
+else:
+txt = topItem.text(fieldIndex)
+if searchRx.indexIn(txt) > -1:
+self.logTree.setCurrentItem(self.logTree.topLevelItem(index))
+break
+else:
+E5MessageBox.information(
+self,
+self.tr("Find Commit"),
+self.tr("""'{0}' was not found.""").format(self.rxEdit.text()))

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py