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

-:a4ce50816cba
+:d4fa462547bc
 from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \
 QSize, QPoint
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \
 QTreeWidgetItem, QApplication, QCursor, QLineEdit, QColor, \
-QPixmap, QPainter, QPen, QBrush, QIcon
+QPixmap, QPainter, QPen, QBrush, QIcon, QMenu
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog
 import Preferences
+import UI.PixmapCache
 COLORNAMES = ["blue", "darkgreen", "red", "green", "darkblue", "purple",
 "cyan", "olive", "magenta", "darkred", "darkmagenta",
 "darkcyan", "gray", "yellow"]
 COLORS = [str(QColor(x).name()) for x in COLORNAMES]
 if self.vcs.version >= (1, 8):
 self.logTree.headerItem().setText(
 self.logTree.columnCount(), self.trUtf8("Bookmarks"))
 if self.vcs.version < (2, 1):
 self.logTree.setColumnHidden(self.PhaseColumn, True)
-self.phaseLine.hide()
-self.phaseButton.hide()
+self.__actionsMenu = QMenu()
-if self.vcs.version < (2, 0):
+if self.vcs.version >= (2, 0):
-self.graftButton.setEnabled(False)
+self.__graftAct = self.__actionsMenu.addAction(
-self.graftButton.hide()
+self.trUtf8("Copy Changesets"), self.__graftActTriggered)
-if self.phaseButton.isHidden() and \
+self.__graftAct.setToolTip(self.trUtf8(
-self.graftButton.isHidden():
+"Copy the selected changesets to the current branch"))
-self.phaseLine.hide()
+else:
+self.__graftAct = None
+if self.vcs.version >= (2, 1):
+self.__phaseAct = self.__actionsMenu.addAction(
+self.trUtf8("Change Phase"), self.__phaseActTriggered)
+self.__phaseAct.setToolTip(self.trUtf8(
+"Change the phase of the selected revisions"))
+self.__phaseAct.setWhatsThis(self.trUtf8(
+"""<b>Change Phase</b>\n<p>This changes the phase of the"""
+""" selected revisions. The selected revisions have to have"""
+""" the same current phase.</p>"""))
+else:
+self.__phaseAct = None
+self.__tagAct = self.__actionsMenu.addAction(
+self.trUtf8("Tag"), self.__tagActTriggered)
+self.__tagAct.setToolTip(self.trUtf8("Tag the selected revision"))
+self.actionsButton.setIcon(
+UI.PixmapCache.getIcon("actionsToolButton.png"))
+self.actionsButton.setMenu(self.__actionsMenu)
 def __initData(self):
 """
 Private method to (re-)initialize some data.
 """
 self.__filterLogsEnabled = True
 self.__filterLogs()
 self.__updateDiffButtons()
-self.__updatePhaseButton()
+self.__updatePhaseAction()
-self.__updateGraftButton()
+self.__updateGraftAction()
 def __readStdout(self):
 """
 Private slot to handle the readyReadStandardOutput signal.
 self.diffP1Button.setEnabled(False)
 self.diffP2Button.setEnabled(False)
 self.diffRevisionsButton.setEnabled(False)
-def __updatePhaseButton(self):
+def __updatePhaseAction(self):
 """
 Private slot to update the status of the phase button.
 """
 if self.initialCommandMode == "log":
 # step 1: count entries with changeable phases
 # step 2: set the status of the phase button
 if public == 0 and \
 ((secret > 0 and draft == 0) or
 (secret == 0 and draft > 0)):
-self.phaseButton.setEnabled(True)
+self.__phaseAct.setEnabled(True)
 else:
-self.phaseButton.setEnabled(False)
+self.__phaseAct.setEnabled(False)
 else:
-self.phaseButton.setEnabled(False)
+self.__phaseAct.setEnabled(False)
-def __updateGraftButton(self):
+def __updateGraftAction(self):
 """
 Private slot to update the status of the graft button.
 """
-if self.graftButton.isVisible():
+if self.__graftAct is not None:
 if self.initialCommandMode == "log":
 # step 1: count selected entries not belonging to the
 #         current branch
 otherBranches = 0
 for itm in self.logTree.selectedItems():
 branch = itm.text(self.BranchColumn)
 if branch != self.__projectBranch:
 otherBranches += 1
-# step 2: set the status of the graft button
+# step 2: set the status of the graft action
-self.graftButton.setEnabled(otherBranches > 0)
+self.__graftAct.setEnabled(otherBranches > 0)
 else:
-self.graftButton.setEnabled(False)
+self.__graftAct.setEnabled(False)
 def __updateGui(self, itm):
 """
 Private slot to update GUI elements except the diff and phase buttons.
 @param current reference to the new current item (QTreeWidgetItem)
 @param previous reference to the old current item (QTreeWidgetItem)
 """
 self.__updateGui(current)
 self.__updateDiffButtons()
-self.__updatePhaseButton()
+self.__updatePhaseAction()
-self.__updateGraftButton()
+self.__updateGraftAction()
 @pyqtSlot()
 def on_logTree_itemSelectionChanged(self):
 """
 Private slot called, when the selection has changed.
 """
 if len(self.logTree.selectedItems()) == 1:
 self.__updateGui(self.logTree.selectedItems()[0])
+self.__tagAct.setEnabled(True)
+else:
+self.__tagAct.setEnabled(False)
 self.__updateDiffButtons()
-self.__updatePhaseButton()
+self.__updatePhaseAction()
-self.__updateGraftButton()
+self.__updateGraftAction()
 @pyqtSlot()
 def on_nextButton_clicked(self):
 """
 Private slot to handle the Next button.
 evt.accept()
 return
 super().keyPressEvent(evt)
 @pyqtSlot()
-def on_phaseButton_clicked(self):
+def __phaseActTriggered(self):
 """
-Private slot to handle the Change Phase button.
+Private slot to handle the Change Phase action.
 """
 currentPhase = self.logTree.selectedItems()[0].text(self.PhaseColumn)
 revs = []
 for itm in self.logTree.selectedItems():
 if itm.text(self.PhaseColumn) == currentPhase:
 revs.append(
 itm.text(self.RevisionColumn).split(":")[0].strip())
 if not revs:
-self.phaseButton.setEnabled(False)
+self.__phaseAct.setEnabled(False)
 return
 if currentPhase == "draft":
 newPhase = "secret"
 data = (revs, "s", True)
 if res:
 for itm in self.logTree.selectedItems():
 itm.setText(self.PhaseColumn, newPhase)
 @pyqtSlot()
-def on_graftButton_clicked(self):
+def __graftActTriggered(self):
 """
-Private slot to handle the Copy Changesets button.
+Private slot to handle the Copy Changesets action.
 """
 revs = []
 for itm in self.logTree.selectedItems():
 branch = itm.text(self.BranchColumn)
 yesDefault=True)
 if res:
 e5App().getObject("Project").reopenProject()
 else:
 self.on_refreshButton_clicked()
+@pyqtSlot()
+def __tagActTriggered(self):
+"""
+Private slot to tag the selected revision.
+"""
+if len(self.logTree.selectedItems()):
+itm = self.logTree.selectedItems()[0]
+rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0]
+tag = itm.text(self.TagsColumn).strip().split(", ", 1)[0]
+res = self.vcs.vcsTag(self.repodir, revision=rev, tagName=tag)
+if res:
+self.on_refreshButton_clicked()

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py