Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 5463
- d84b854d59c0
- parent 5459
- cdfdecd2faef
- child 5477
- fb8875e356d4
equal
deleted
inserted
replaced
| 5462:52b2f19226e7 | 5463:d84b854d59c0 |
|---|---|
| 952 self.__finish() | 952 self.__finish() |
| 953 else: | 953 else: |
| 954 self.process.kill() | 954 self.process.kill() |
| 955 | 955 |
| 956 self.process.setWorkingDirectory(self.repodir) | 956 self.process.setWorkingDirectory(self.repodir) |
| 957 | |
| 958 self.inputGroup.setEnabled(True) | |
| 959 self.inputGroup.show() | |
| 960 | 957 |
| 961 if preargs: | 958 if preargs: |
| 962 process = QProcess() | 959 process = QProcess() |
| 963 process.setWorkingDirectory(self.repodir) | 960 process.setWorkingDirectory(self.repodir) |
| 964 process.start('hg', args) | 961 process.start('hg', args) |
| 1267 @param out error to be shown (string) | 1264 @param out error to be shown (string) |
| 1268 """ | 1265 """ |
| 1269 self.errorGroup.show() | 1266 self.errorGroup.show() |
| 1270 self.errors.insertPlainText(out) | 1267 self.errors.insertPlainText(out) |
| 1271 self.errors.ensureCursorVisible() | 1268 self.errors.ensureCursorVisible() |
| 1269 | |
| 1270 if not self.__hgClient: | |
| 1271 # show input in case the process asked for some input | |
| 1272 self.inputGroup.setEnabled(True) | |
| 1273 self.inputGroup.show() | |
| 1272 | 1274 |
| 1273 def __diffRevisions(self, rev1, rev2): | 1275 def __diffRevisions(self, rev1, rev2): |
| 1274 """ | 1276 """ |
| 1275 Private method to do a diff of two revisions. | 1277 Private method to do a diff of two revisions. |
| 1276 | 1278 |
| 1757 """ | 1759 """ |
| 1758 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) | 1760 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
| 1759 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) | 1761 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) |
| 1760 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) | 1762 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
| 1761 | 1763 |
| 1762 self.inputGroup.setEnabled(True) | |
| 1763 self.inputGroup.show() | |
| 1764 self.refreshButton.setEnabled(False) | 1764 self.refreshButton.setEnabled(False) |
| 1765 | 1765 |
| 1766 # save the current items commit ID | 1766 # save the current items commit ID |
| 1767 itm = self.logTree.currentItem() | 1767 itm = self.logTree.currentItem() |
| 1768 if itm is not None: | 1768 if itm is not None: |
| 1804 self.errors.insertPlainText(os.linesep) | 1804 self.errors.insertPlainText(os.linesep) |
| 1805 self.errors.ensureCursorVisible() | 1805 self.errors.ensureCursorVisible() |
| 1806 else: | 1806 else: |
| 1807 self.errors.insertPlainText(input) | 1807 self.errors.insertPlainText(input) |
| 1808 self.errors.ensureCursorVisible() | 1808 self.errors.ensureCursorVisible() |
| 1809 self.errorGroup.show() | |
| 1810 | 1809 |
| 1811 self.process.write(input) | 1810 self.process.write(input) |
| 1812 | 1811 |
| 1813 self.passwordCheckBox.setChecked(False) | 1812 self.passwordCheckBox.setChecked(False) |
| 1814 self.input.clear() | 1813 self.input.clear() |
