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

-:5d9e1a724c1f
+:04f395eef728
 pass
 import os
 from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer
+from PyQt5.QtGui import QTextCursor
 from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QMenu, QHeaderView, \
 QTreeWidgetItem, QLineEdit
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 from .Ui_HgStatusDialog import Ui_HgStatusDialog
+from .HgDiffHighlighter import HgDiffHighlighter
+from .HgDiffGenerator import HgDiffGenerator
 import Preferences
 class HgStatusDialog(QWidget, Ui_HgStatusDialog):
 self.process = QProcess()
 self.process.finished.connect(self.__procFinished)
 self.process.readyReadStandardOutput.connect(self.__readStdout)
 self.process.readyReadStandardError.connect(self.__readStderr)
+self.__hDiffSplitterState = None
 self.statusList.headerItem().setText(self.__lastColumn, "")
 self.statusList.header().setSortIndicator(
 self.__pathColumn, Qt.AscendingOrder)
+font = Preferences.getEditorOtherFonts("MonospacedFont")
+self.diffEdit.setFontFamily(font.family())
+self.diffEdit.setFontPointSize(font.pointSize())
+self.diffHighlighter = HgDiffHighlighter(self.diffEdit.document())
+self.__diffGenerator = HgDiffGenerator(vcs, self)
+self.__diffGenerator.finished.connect(self.__generatorFinished)
+self.__selectedName = ""
 if mq:
 self.buttonsLine.setVisible(False)
 self.addButton.setVisible(False)
 self.diffButton.setVisible(False)
 self.sbsDiffButton.setVisible(False)
 self.revertButton.setVisible(False)
 self.forgetButton.setVisible(False)
 self.restoreButton.setVisible(False)
+self.diffEdit.setVisible(False)
 self.menuactions = []
 self.lfActions = []
 self.menu = QMenu()
 if not mq:
 'R': self.tr('removed'),
 '?': self.tr('not tracked'),
 '!': self.tr('missing'),
 }
+def show(self):
+"""
+Public slot to show the dialog.
+"""
+super(HgStatusDialog, self).show()
+if not self.__mq and self.__hDiffSplitterState:
+self.diffSplitter.restoreState(self.__hDiffSplitterState)
 def __resort(self):
 """
 Private method to resort the tree.
 """
 self.statusList.sortItems(
 if self.process is not None and \
 self.process.state() != QProcess.NotRunning:
 self.process.terminate()
 QTimer.singleShot(2000, self.process.kill)
 self.process.waitForFinished(3000)
+if not self.__mq:
+self.__hDiffSplitterState = self.diffSplitter.saveState()
 e.accept()
 def start(self, fn):
 """
 self.__resort()
 self.__resizeColumns()
 self.__updateButtons()
 self.__updateCommitButton()
+self.__refreshDiff()
 def on_buttonBox_clicked(self, button):
 """
 Private slot called by a button of the button box clicked.
 @pyqtSlot()
 def on_refreshButton_clicked(self):
 """
 Private slot to refresh the status display.
 """
+selectedItems = self.statusList.selectedItems()
+if len(selectedItems) == 1:
+self.__selectedName = selectedItems[0].text(self.__pathColumn)
+else:
+self.__selectedName = ""
 self.start(self.args)
 def __updateButtons(self):
 """
 Private method to update the VCS buttons status.
 def on_statusList_itemSelectionChanged(self):
 """
 Private slot to act upon changes of selected items.
 """
 self.__updateButtons()
+self.__generateDiffs()
 @pyqtSlot()
 def on_commitButton_clicked(self):
 """
 Private slot to handle the press of the Commit button.
 if itm.flags() & Qt.ItemIsUserCheckable:
 if selected:
 itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked)
 else:
 itm.setCheckState(self.__toBeCommittedColumn, Qt.Unchecked)
+###########################################################################
+## Diff handling methods below
+###########################################################################
+def __generateDiffs(self):
+"""
+Private slot to generate diff outputs for the selected item.
+"""
+self.diffEdit.clear()
+if not self.__mq:
+selectedItems = self.statusList.selectedItems()
+if len(selectedItems) == 1:
+fn = os.path.join(self.dname,
+selectedItems[0].text(self.__pathColumn))
+self.__diffGenerator.start(fn)
+def __generatorFinished(self):
+"""
+Private slot connected to the finished signal of the diff generator.
+"""
+diff = self.__diffGenerator.getResult()[0]
+if diff:
+for line in diff[:]:
+if line.startswith("@@ "):
+break
+else:
+diff.pop(0)
+self.diffEdit.setPlainText("".join(diff))
+tc = self.diffEdit.textCursor()
+tc.movePosition(QTextCursor.Start)
+self.diffEdit.setTextCursor(tc)
+self.diffEdit.ensureCursorVisible()
+def __refreshDiff(self):
+"""
+Private method to refresh the diff output after a refresh.
+"""
+if self.__selectedName and not self.__mq:
+for index in range(self.statusList.topLevelItemCount()):
+itm = self.statusList.topLevelItem(index)
+if itm.text(self.__pathColumn) == self.__selectedName:
+itm.setSelected(True)
+break
+self.__selectedName = ""

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py

Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py