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

-:dbeeed55df08
+:5fb53279f2df
 """
 Module implementing a dialog to show a list of files which had or still have
 conflicts.
 """
 import os
-from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
+from PyQt5.QtCore import pyqtSlot, Qt, QPoint
 from PyQt5.QtWidgets import (
-QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit,
+QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem,
 QApplication, QWidget
 )
-from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog
 import Utilities.MimeTypes
-from Globals import strToQByteArray
 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog):
 """
 Class implementing a dialog to show a list of files which had or still
 self.vcs = vcs
 self.project = e5App().getObject("Project")
 self.__hgClient = vcs.getClient()
-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)
 def closeEvent(self, e):
 """
 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.__position = self.pos()
 e.accept()
 Private method to get the conflict entries.
 """
 args = self.vcs.initCommand("resolve")
 args.append('--list')
-if self.__hgClient:
+out, err = self.__hgClient.runcommand(args)
-self.inputGroup.setEnabled(False)
+if err:
-self.inputGroup.hide()
+self.__showError(err)
+if out:
-out, err = self.__hgClient.runcommand(args)
+for line in out.splitlines():
-if err:
+self.__processOutputLine(line)
-self.__showError(err)
+if self.__hgClient.wasCanceled():
-if out:
+break
-for line in out.splitlines():
+self.__finish()
-self.__processOutputLine(line)
-if self.__hgClient.wasCanceled():
-break
-self.__finish()
-else:
-self.process.kill()
-self.process.setWorkingDirectory(self.__repodir)
-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.inputGroup.setEnabled(True)
-self.inputGroup.show()
 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)
 self.__resizeColumns()
 self.__resort()
 self.on_conflictsList_itemSelectionChanged()
 @param button button that was clicked (QAbstractButton)
 """
 if button == self.buttonBox.button(QDialogButtonBox.Close):
 self.close()
 elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
-if self.__hgClient:
+self.__hgClient.cancel()
-self.__hgClient.cancel()
-else:
-self.__finish()
 elif button == self.refreshButton:
 self.on_refreshButton_clicked()
-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.__finish()
 def __resort(self):
 """
 Private method to resort the tree.
 """
 itm.setText(1, name)
 itm.setData(0, self.StatusRole, status)
 itm.setData(0, self.FilenameRole, self.project.getAbsolutePath(name))
-def __readStdout(self):
-"""
-Private slot to handle the readyReadStdout signal.
-It reads the output of the process, formats it and inserts it into
-the contents pane.
-"""
-self.process.setReadChannel(QProcess.StandardOutput)
-while self.process.canReadLine():
-s = str(self.process.readLine(), self.vcs.getEncoding(),
-'replace').strip()
-self.__processOutputLine(s)
 def __processOutputLine(self, line):
 """
 Private method to process the lines of output.
 @param line output line to be processed (string)
 """
 status, filename = line.strip().split(None, 1)
 self.__generateItem(status, filename)
+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()
 @pyqtSlot()
 def on_refreshButton_clicked(self):
 """
 Private slot to refresh the log.
 """
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
-self.inputGroup.setEnabled(True)
-self.inputGroup.show()
 self.refreshButton.setEnabled(False)
 self.start(self.__repodir)
-def __readStderr(self):
-"""
-Private slot to handle the readyReadStderr 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()
-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 subversion 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(HgConflictsListDialog, self).keyPressEvent(evt)
 @pyqtSlot(QTreeWidgetItem, int)
 def on_conflictsList_itemDoubleClicked(self, item, column):
 """
 Private slot to open the double clicked entry.

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py