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

-:dbeeed55df08
+:5fb53279f2df
 """
 Module implementing a dialog to browse the log history.
 """
 import os
 import re
 import collections
-from PyQt5.QtCore import (
+from PyQt5.QtCore import pyqtSlot, Qt, QDate, QRegExp, QSize, QPoint, QFileInfo
-pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, QSize, QPoint, QFileInfo
-)
 from PyQt5.QtGui import (
 QCursor, QColor, QPixmap, QPainter, QPen, QBrush, QIcon, QTextCursor
 )
 from PyQt5.QtWidgets import (
 QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication,
 from .HgDiffGenerator import HgDiffGenerator
 import UI.PixmapCache
 import Preferences
 import Utilities
-from Globals import strToQByteArray
 COLORNAMES = ["blue", "darkgreen", "red", "green", "darkblue", "purple",
 "cyan", "olive", "magenta", "darkred", "darkmagenta",
 "darkcyan", "gray", "yellow"]
 COLORS = [str(QColor(x).name()) for x in COLORNAMES]
 self.__incomingRole = Qt.UserRole + 5
 # roles used in the file tree
 self.__diffFileLineRole = Qt.UserRole
-if self.__hgClient:
-self.process = None
-else:
-self.process = QProcess()
-self.process.finished.connect(self.__procFinished)
-self.process.readyReadStandardOutput.connect(self.__readStdout)
-self.process.readyReadStandardError.connect(self.__readStderr)
 self.flags = {
 'A': self.tr('Added'),
 'D': self.tr('Deleted'),
 'M': self.tr('Modified'),
 }
 """
 Protected slot implementing a close event handler.
 @param e close event (QCloseEvent)
 """
-if self.__hgClient:
+if self.__hgClient.isExecuting():
-if self.__hgClient.isExecuting():
+self.__hgClient.cancel()
-self.__hgClient.cancel()
-else:
-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)
 self.vcs.getPlugin().setPreferences(
 "LogBrowserGeometry", self.saveGeometry())
 self.vcs.getPlugin().setPreferences(
 "LogBrowserSplitterStates", [
 args.append("-r")
 args.append(rev)
 if not self.projectMode:
 args.append(self.__filename)
-output = ""
+output, errMsg = self.__hgClient.runcommand(args)
-if self.__hgClient:
-output, errMsg = self.__hgClient.runcommand(args)
-else:
-process = QProcess()
-process.setWorkingDirectory(self.repodir)
-process.start('hg', args)
-procStarted = process.waitForStarted(5000)
-if procStarted:
-finished = process.waitForFinished(30000)
-if finished and process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
-self.vcs.getEncoding(), 'replace')
-else:
-if not finished:
-errMsg = self.tr(
-"The hg process did not finish within 30s.")
-else:
-errMsg = self.tr("Could not start the hg executable.")
-if errMsg:
-E5MessageBox.critical(
-self,
-self.tr("Mercurial Error"),
-errMsg)
 if output:
 parents = [int(p) for p in output.strip().splitlines()]
 return parents
 errMsg = ""
 args = self.vcs.initCommand("identify")
 args.append("-nb")
-output = ""
+output, errMsg = self.__hgClient.runcommand(args)
-if self.__hgClient:
-output, errMsg = self.__hgClient.runcommand(args)
-else:
-process = QProcess()
-process.setWorkingDirectory(self.repodir)
-process.start('hg', args)
-procStarted = process.waitForStarted(5000)
-if procStarted:
-finished = process.waitForFinished(30000)
-if finished and process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
-self.vcs.getEncoding(), 'replace')
-else:
-if not finished:
-errMsg = self.tr(
-"The hg process did not finish within 30s.")
-else:
-errMsg = self.tr("Could not start the hg executable.")
 if errMsg:
 E5MessageBox.critical(
 self,
 self.tr("Mercurial Error"),
 errMsg = ""
 args = self.vcs.initCommand("branches")
 args.append("--closed")
-output = ""
+output, errMsg = self.__hgClient.runcommand(args)
-if self.__hgClient:
-output, errMsg = self.__hgClient.runcommand(args)
-else:
-process = QProcess()
-process.setWorkingDirectory(self.repodir)
-process.start('hg', args)
-procStarted = process.waitForStarted(5000)
-if procStarted:
-finished = process.waitForFinished(30000)
-if finished and process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
-self.vcs.getEncoding(), 'replace')
-else:
-if not finished:
-errMsg = self.tr(
-"The hg process did not finish within 30s.")
-else:
-errMsg = self.tr("Could not start the hg executable.")
 if errMsg:
 E5MessageBox.critical(
 self,
 self.tr("Mercurial Error"),
 args = self.vcs.initCommand("heads")
 args.append("--closed")
 args.append("--template")
 args.append("{rev}\n")
-output = ""
+output, errMsg = self.__hgClient.runcommand(args)
-if self.__hgClient:
-output, errMsg = self.__hgClient.runcommand(args)
-else:
-process = QProcess()
-process.setWorkingDirectory(self.repodir)
-process.start('hg', args)
-procStarted = process.waitForStarted(5000)
-if procStarted:
-finished = process.waitForFinished(30000)
-if finished and process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
-self.vcs.getEncoding(), 'replace')
-else:
-if not finished:
-errMsg = self.tr(
-"The hg process did not finish within 30s.")
-else:
-errMsg = self.tr("Could not start the hg executable.")
 if errMsg:
 E5MessageBox.critical(
 self,
 self.tr("Mercurial Error"),
 """
 errMsg = ""
 args = self.vcs.initCommand("tags")
-output = ""
+output, errMsg = self.__hgClient.runcommand(args)
-if self.__hgClient:
-output, errMsg = self.__hgClient.runcommand(args)
-else:
-process = QProcess()
-process.setWorkingDirectory(self.repodir)
-process.start('hg', args)
-procStarted = process.waitForStarted(5000)
-if procStarted:
-finished = process.waitForFinished(30000)
-if finished and process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
-self.vcs.getEncoding(), 'replace')
-else:
-if not finished:
-errMsg = self.tr(
-"The hg process did not finish within 30s.")
-else:
-errMsg = self.tr("Could not start the hg executable.")
 if errMsg:
 E5MessageBox.critical(
 self,
 self.tr("Mercurial Error"),
 preargs.append(self.vcs.bundleFile)
 args.append(self.vcs.bundleFile)
 if not self.projectMode:
 args.append(self.__filename)
-if self.__hgClient:
+if preargs:
-self.inputGroup.setEnabled(False)
+out, err = self.__hgClient.runcommand(preargs)
-self.inputGroup.hide()
+else:
+err = ""
-if preargs:
+if err:
-out, err = self.__hgClient.runcommand(preargs)
+if (
-else:
-err = ""
-if err:
-if (
-self.commandMode == "incoming" and
-self.initialCommandMode == "full_log"
-):
-# ignore the error
-self.commandMode = "log"
-else:
-self.__showError(err)
-elif (
-self.commandMode != "incoming" or
-(self.vcs.bundleFile and
-os.path.exists(self.vcs.bundleFile)) or
-self.__bundle
-):
-out, err = self.__hgClient.runcommand(args)
-self.buf = out.splitlines(True)
-if err:
-self.__showError(err)
-self.__processBuffer()
-elif (
 self.commandMode == "incoming" and
 self.initialCommandMode == "full_log"
 ):
-# no incoming changesets, just switch to log mode
+# ignore the error
 self.commandMode = "log"
-self.__finish()
+else:
-else:
+self.__showError(err)
-self.process.kill()
+elif (
+self.commandMode != "incoming" or
-self.process.setWorkingDirectory(self.repodir)
+(self.vcs.bundleFile and
+os.path.exists(self.vcs.bundleFile)) or
-if preargs:
+self.__bundle
-process = QProcess()
+):
-process.setWorkingDirectory(self.repodir)
+out, err = self.__hgClient.runcommand(args)
-process.start('hg', args)
+self.buf = out.splitlines(True)
-procStarted = process.waitForStarted(5000)
+if err:
-if procStarted:
+self.__showError(err)
-process.waitForFinished(30000)
+self.__processBuffer()
+elif (
-if (
+self.commandMode == "incoming" and
-self.commandMode != "incoming" or
+self.initialCommandMode == "full_log"
-(self.vcs.bundleFile and
+):
-os.path.exists(self.vcs.bundleFile)) or
+# no incoming changesets, just switch to log mode
-self.__bundle
+self.commandMode = "log"
-):
+self.__finish()
-self.process.start('hg', args)
-procStarted = self.process.waitForStarted(5000)
-if not procStarted:
-self.inputGroup.setEnabled(False)
-self.inputGroup.hide()
-E5MessageBox.critical(
-self,
-self.tr('Process Generation Error'),
-self.tr(
-'The process {0} could not be started. '
-'Ensure, that it is in the search path.'
-).format('hg'))
-else:
-self.__finish()
 def start(self, fn, bundle=None, isFile=False, noEntries=0):
 """
 Public slot to start the hg log command.
 self.__identifyProject()
 self.__getClosedBranches()
 self.__getHeads()
 self.__getLogEntries(noEntries=noEntries)
-def __procFinished(self, exitCode, exitStatus):
-"""
-Private slot connected to the finished signal.
-@param exitCode exit code of the process (integer)
-@param exitStatus exit status of the process (QProcess.ExitStatus)
-"""
-self.__processBuffer()
-self.__finish()
 def __finish(self):
 """
 Private slot called when the process finished or the user pressed
 the button.
 """
-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)
 QApplication.restoreOverrideCursor()
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
 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)
 while self.__finishCallbacks:
 self.__finishCallbacks.pop(0)()
 revision, Qt.MatchExactly, self.RevisionColumn)
 if items:
 items[0].setSelected(True)
 self.__selectedRevisions = []
-def __readStdout(self):
-"""
-Private slot to handle the readyReadStandardOutput signal.
-It reads the output of the process and inserts it into a buffer.
-"""
-self.process.setReadChannel(QProcess.StandardOutput)
-while self.process.canReadLine():
-line = str(self.process.readLine(), self.vcs.getEncoding(),
-'replace')
-self.buf.append(line)
-def __readStderr(self):
-"""
-Private slot to handle the readyReadStandardError signal.
-It reads the error output of the process and inserts it into the
-error pane.
-"""
-if self.process is not None:
-s = str(self.process.readAllStandardError(),
-self.vcs.getEncoding(), 'replace')
-self.__showError(s)
 def __showError(self, out):
 """
 Private slot to show some error.
 @param out error to be shown (string)
 """
 self.errorGroup.show()
 self.errors.insertPlainText(out)
 self.errors.ensureCursorVisible()
-if not self.__hgClient:
-# show input in case the process asked for some input
-self.inputGroup.setEnabled(True)
-self.inputGroup.show()
 def on_buttonBox_clicked(self, button):
 """
 Private slot called by a button of the button box clicked.
 """
 if button == self.buttonBox.button(QDialogButtonBox.Close):
 self.close()
 elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
 self.cancelled = True
-if self.__hgClient:
+self.__hgClient.cancel()
-self.__hgClient.cancel()
-else:
-self.__finish()
 elif button == self.refreshButton:
 self.on_refreshButton_clicked()
 def __updateSbsSelectLabel(self):
 """
 else:
 self.commandMode = self.initialCommandMode
 self.start(self.__filename, bundle=self.__bundle, isFile=self.__isFile,
 noEntries=self.logTree.topLevelItemCount())
-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)
-"""
-if isOn:
-self.input.setEchoMode(QLineEdit.Password)
-else:
-self.input.setEchoMode(QLineEdit.Normal)
-@pyqtSlot()
-def on_sendButton_clicked(self):
-"""
-Private slot to send the input to the mercurial process.
-"""
-inputTxt = self.input.text()
-inputTxt += os.linesep
-if self.passwordCheckBox.isChecked():
-self.errors.insertPlainText(os.linesep)
-self.errors.ensureCursorVisible()
-else:
-self.errors.insertPlainText(inputTxt)
-self.errors.ensureCursorVisible()
-self.process.write(strToQByteArray(inputTxt))
-self.passwordCheckBox.setChecked(False)
-self.input.clear()
-def on_input_returnPressed(self):
-"""
-Private slot to handle the press of the return key in the input field.
-"""
-self.intercept = True
-self.on_sendButton_clicked()
-def keyPressEvent(self, evt):
-"""
-Protected slot to handle a key press event.
-@param evt the key press event (QKeyEvent)
-"""
-if self.intercept:
-self.intercept = False
-evt.accept()
-return
-super(HgLogBrowserDialog, self).keyPressEvent(evt)
 @pyqtSlot()
 def __phaseActTriggered(self):
 """
 Private slot to handle the Change Phase action.
 """

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py