Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- changeset 537
- 72b32daeb8d6
- parent 495
- b31b0bffa5b0
- child 564
- b3d966393ba9
equal
deleted
inserted
replaced
| 536:6d8d39753c82 | 537:72b32daeb8d6 |
|---|---|
| 8 """ | 8 """ |
| 9 | 9 |
| 10 import os | 10 import os |
| 11 | 11 |
| 12 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray | 12 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray |
| 13 from PyQt4.QtGui import QWidget, QDialogButtonBox, QApplication, QMessageBox, \ | 13 from PyQt4.QtGui import QWidget, QDialogButtonBox, QApplication, \ |
| 14 QLineEdit, QTextCursor | 14 QLineEdit, QTextCursor |
| 15 | 15 |
| 16 from E5Gui.E5Application import e5App | 16 from E5Gui.E5Application import e5App |
| 17 from E5Gui import E5MessageBox | |
| 17 | 18 |
| 18 from .Ui_HgLogDialog import Ui_HgLogDialog | 19 from .Ui_HgLogDialog import Ui_HgLogDialog |
| 19 from .HgDiffDialog import HgDiffDialog | 20 from .HgDiffDialog import HgDiffDialog |
| 20 | 21 |
| 21 import Utilities | 22 import Utilities |
| 142 | 143 |
| 143 self.process.start('hg', args) | 144 self.process.start('hg', args) |
| 144 procStarted = self.process.waitForStarted() | 145 procStarted = self.process.waitForStarted() |
| 145 if not procStarted: | 146 if not procStarted: |
| 146 self.inputGroup.setEnabled(False) | 147 self.inputGroup.setEnabled(False) |
| 147 QMessageBox.critical(None, | 148 E5MessageBox.critical(self, |
| 148 self.trUtf8('Process Generation Error'), | 149 self.trUtf8('Process Generation Error'), |
| 149 self.trUtf8( | 150 self.trUtf8( |
| 150 'The process {0} could not be started. ' | 151 'The process {0} could not be started. ' |
| 151 'Ensure, that it is in the search path.' | 152 'Ensure, that it is in the search path.' |
| 152 ).format('hg')) | 153 ).format('hg')) |
| 194 errMsg = self.trUtf8("The hg process did not finish within 30s.") | 195 errMsg = self.trUtf8("The hg process did not finish within 30s.") |
| 195 else: | 196 else: |
| 196 errMsg = self.trUtf8("Could not start the hg executable.") | 197 errMsg = self.trUtf8("Could not start the hg executable.") |
| 197 | 198 |
| 198 if errMsg: | 199 if errMsg: |
| 199 QMessageBox.critical(self, | 200 E5MessageBox.critical(self, |
| 200 self.trUtf8("Mercurial Error"), | 201 self.trUtf8("Mercurial Error"), |
| 201 errMsg) | 202 errMsg) |
| 202 | 203 |
| 203 return parents | 204 return parents |
| 204 | 205 |
