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

-:243e6075af82
+:8df9706ef7f4
 import os
 from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \
 QSize, QPoint
-from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \
+from PyQt4.QtGui import QWidget, QDialogButtonBox, QHeaderView, \
 QTreeWidgetItem, QApplication, QCursor, QLineEdit, QColor, \
 QPixmap, QPainter, QPen, QBrush, QIcon, QMenu
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 "cyan", "olive", "magenta", "darkred", "darkmagenta",
 "darkcyan", "gray", "yellow"]
 COLORS = [str(QColor(x).name()) for x in COLORNAMES]
-class HgLogBrowserDialog(QDialog, Ui_HgLogBrowserDialog):
+class HgLogBrowserDialog(QWidget, Ui_HgLogBrowserDialog):
 """
 Class implementing a dialog to browse the log history.
 """
 IconColumn = 0
 BranchColumn = 1
 @param isFile flag indicating log for a file is to be shown (boolean)
 @param parent parent widget (QWidget)
 """
 super().__init__(parent)
 self.setupUi(self)
-self.setWindowFlags(self.windowFlags() | Qt.WindowMinMaxButtonsHint)
 if mode == "log":
 self.setWindowTitle(self.tr("Mercurial Log"))
 elif mode == "incoming":
 self.setWindowTitle(self.tr("Mercurial Log (Incoming)"))
 self.tr("Copy Changesets"), self.__graftActTriggered)
 self.__graftAct.setToolTip(self.tr(
 "Copy the selected changesets to the current branch"))
 else:
 self.__graftAct = None
 if self.vcs.version >= (2, 1):
 self.__phaseAct = self.__actionsMenu.addAction(
 self.tr("Change Phase"), self.__phaseActTriggered)
 self.__phaseAct.setToolTip(self.tr(
 "Change the phase of the selected revisions"))
 """<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.tr("Tag"), self.__tagActTriggered)
 self.__tagAct.setToolTip(self.tr("Tag the selected revision"))
+self.__switchAct = self.__actionsMenu.addAction(
+self.tr("Switch"), self.__switchActTriggered)
+self.__switchAct.setToolTip(self.tr(
+"Switch the working directory to the selected revision"))
 self.actionsButton.setIcon(
 UI.PixmapCache.getIcon("actionsToolButton.png"))
 self.actionsButton.setMenu(self.__actionsMenu)
 def __initData(self):
 self.__filterLogsEnabled = True
 self.__filterLogs()
 self.__updateDiffButtons()
-self.__updatePhaseAction()
+self.__updateToolMenuActions()
-self.__updateGraftAction()
-self.__updateTagAction()
 def __readStdout(self):
 """
 Private slot to handle the readyReadStandardOutput signal.
 self.diffP1Button.setEnabled(False)
 self.diffP2Button.setEnabled(False)
 self.diffRevisionsButton.setEnabled(False)
-def __updatePhaseAction(self):
+def __updateToolMenuActions(self):
 """
-Private slot to update the status of the phase action.
+Private slot to update the status of the tool menu actions and
-"""
+the tool menu button.
-if self.initialCommandMode == "log":
+"""
-# step 1: count entries with changeable phases
+if self.initialCommandMode == "log" and self.projectMode:
-secret = 0
+if self.__phaseAct is not None:
-draft = 0
+# step 1: count entries with changeable phases
-public = 0
+secret = 0
-for itm in self.logTree.selectedItems():
+draft = 0
-phase = itm.text(self.PhaseColumn)
+public = 0
-if phase == "draft":
+for itm in self.logTree.selectedItems():
-draft += 1
+phase = itm.text(self.PhaseColumn)
-elif phase == "secret":
+if phase == "draft":
-secret += 1
+draft += 1
+elif phase == "secret":
+secret += 1
+else:
+public += 1
+# 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.__phaseAct.setEnabled(True)
 else:
-public += 1
+self.__phaseAct.setEnabled(False)
-# step 2: set the status of the phase button
+if self.__graftAct is not None:
-if public == 0 and \
-((secret > 0 and draft == 0) or
-(secret == 0 and draft > 0)):
-self.__phaseAct.setEnabled(True)
-else:
-self.__phaseAct.setEnabled(False)
-else:
-self.__phaseAct.setEnabled(False)
-def __updateGraftAction(self):
-"""
-Private slot to update the status of the graft action.
-"""
-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 action
 self.__graftAct.setEnabled(otherBranches > 0)
-else:
-self.__graftAct.setEnabled(False)
-def __updateTagAction(self):
-"""
-Private slot to update the status of the graft action.
-"""
-if self.initialCommandMode == "log":
 self.__tagAct.setEnabled(len(self.logTree.selectedItems()) == 1)
-else:
+self.__switchAct.setEnabled(len(self.logTree.selectedItems()) == 1)
-self.__tagAct.setEnabled(False)
+self.actionsButton.setEnabled(True)
+else:
+self.actionsButton.setEnabled(False)
 def __updateGui(self, itm):
 """
-Private slot to update GUI elements except the diff and phase buttons.
+Private slot to update GUI elements except tool menu actions.
 @param itm reference to the item the update should be based on
 (QTreeWidgetItem)
 """
 self.messageEdit.clear()
 @param current reference to the new current item (QTreeWidgetItem)
 @param previous reference to the old current item (QTreeWidgetItem)
 """
 self.__updateGui(current)
 self.__updateDiffButtons()
-self.__updatePhaseAction()
+self.__updateToolMenuActions()
-self.__updateGraftAction()
-self.__updateTagAction()
 @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.__updateDiffButtons()
-self.__updatePhaseAction()
+self.__updateToolMenuActions()
-self.__updateGraftAction()
-self.__updateTagAction()
 @pyqtSlot()
 def on_nextButton_clicked(self):
 """
 Private slot to handle the Next button.
 self.tr(
 """The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
 e5App().getObject("Project").reopenProject()
-else:
+return
-self.on_refreshButton_clicked()
+self.on_refreshButton_clicked()
 @pyqtSlot()
 def __tagActTriggered(self):
 """
 Private slot to tag the selected revision.
 """
-if len(self.logTree.selectedItems()):
+if len(self.logTree.selectedItems()) == 1:
 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()
+@pyqtSlot()
+def __switchActTriggered(self):
+"""
+Private slot to switch the working directory to the
+selected revision.
+"""
+if len(self.logTree.selectedItems()) == 1:
+itm = self.logTree.selectedItems()[0]
+rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0]
+if rev:
+shouldReopen = self.vcs.vcsUpdate(self.repodir, revision=rev)
+if shouldReopen:
+res = E5MessageBox.yesNo(
+None,
+self.tr("Switch"),
+self.tr(
+"""The project should be reread. Do this now?"""),
+yesDefault=True)
+if res:
+e5App().getObject("Project").reopenProject()
+return
+self.on_refreshButton_clicked()

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py