Sun, 18 May 2014 14:13:09 +0200
Corrected a bunch of source docu issues.
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
3160
209a07d7e401
Updated copyright for 2014.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3036
diff
changeset
|
3 | # Copyright (c) 2010 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing a dialog to show the output of the hg log command process. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
3145
a9de05d4a22f
# __IGNORE_WARNING__ added/ removed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3060
diff
changeset
|
10 | from __future__ import unicode_literals |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
11 | try: |
3484 | 12 | str = unicode |
13 | except NameError: | |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
14 | pass |
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
15 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | import os |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | |
495
b31b0bffa5b0
Continued porting signal/slot usage to the new API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
470
diff
changeset
|
18 | from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray |
537
72b32daeb8d6
Continued replacing QMessageBox methods with own methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
495
diff
changeset
|
19 | from PyQt4.QtGui import QWidget, QDialogButtonBox, QApplication, \ |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | QLineEdit, QTextCursor |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | |
207
3f889378dede
Added some code to inspect incoming patches as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
22 | from E5Gui.E5Application import e5App |
537
72b32daeb8d6
Continued replacing QMessageBox methods with own methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
495
diff
changeset
|
23 | from E5Gui import E5MessageBox |
207
3f889378dede
Added some code to inspect incoming patches as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
24 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | from .Ui_HgLogDialog import Ui_HgLogDialog |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | import Utilities |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
29 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | class HgLogDialog(QWidget, Ui_HgLogDialog): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
32 | Class implementing a dialog to show the output of the hg log command |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
33 | process. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
35 | The dialog is nonmodal. Clicking a link in the upper text pane shows |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | a diff of the revisions. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
38 | def __init__(self, vcs, mode="log", bundle=None, isFile=False, |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
39 | parent=None): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | Constructor |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | @param vcs reference to the vcs object |
181
4af57f97c1bc
Added code to choose the way incoming and outgoing logs are shown.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
44 | @param mode mode of the dialog (string; one of log, incoming, outgoing) |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
45 | @param bundle name of a bundle file (string) |
2841
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
46 | @param isFile flag indicating log for a file is to be shown (boolean) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | @param parent parent widget (QWidget) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | """ |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
49 | super(HgLogDialog, self).__init__(parent) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | self.setupUi(self) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | self.process = QProcess() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | self.vcs = vcs |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | if mode in ("log", "incoming", "outgoing"): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | self.mode = mode |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | self.mode = "log" |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
60 | self.bundle = bundle |
3518
1d681235c1b4
Fixed the Mercurial command server client handling large data chunks on slow machines.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3516
diff
changeset
|
61 | self.__hgClient = self.vcs.getClient() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | |
564
b3d966393ba9
Did some code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
63 | self.contents.setHtml( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
64 | self.tr('<b>Processing your request, please wait...</b>')) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | |
464
a2b1d1770ef0
Continued porting signal/slot usage to the new API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
66 | self.process.finished.connect(self.__procFinished) |
a2b1d1770ef0
Continued porting signal/slot usage to the new API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
67 | self.process.readyReadStandardOutput.connect(self.__readStdout) |
470
99d8c50ba42f
Fixed some bugs introduced by signal/slot API conversion.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
464
diff
changeset
|
68 | self.process.readyReadStandardError.connect(self.__readStderr) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | |
495
b31b0bffa5b0
Continued porting signal/slot usage to the new API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
470
diff
changeset
|
70 | self.contents.anchorClicked.connect(self.__sourceChanged) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | self.revisions = [] # stack of remembered revisions |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
73 | self.revString = self.tr('Revision') |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
74 | self.projectMode = False |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
76 | self.logEntries = [] # list of log entries |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
77 | self.lastLogEntry = {} |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
78 | self.fileCopies = {} |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
79 | self.endInitialText = False |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
80 | self.initialText = [] |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
81 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | self.diff = None |
2841
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
83 | |
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
84 | self.sbsCheckBox.setEnabled(isFile) |
2848
15c84f1f745a
A little enhancement to the side-by-side diff function of the various VCS interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2841
diff
changeset
|
85 | self.sbsCheckBox.setVisible(isFile) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | def closeEvent(self, e): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | """ |
3591
2f2a4a76dd22
Corrected a bunch of source docu issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
89 | Protected slot implementing a close event handler. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | @param e close event (QCloseEvent) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | """ |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
93 | if self.__hgClient: |
1256
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1246
diff
changeset
|
94 | if self.__hgClient.isExecuting(): |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1246
diff
changeset
|
95 | self.__hgClient.cancel() |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
96 | else: |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
97 | if self.process is not None and \ |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
98 | self.process.state() != QProcess.NotRunning: |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
99 | self.process.terminate() |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
100 | QTimer.singleShot(2000, self.process.kill) |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
101 | self.process.waitForFinished(3000) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | e.accept() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | |
1274
442c748018c5
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1265
diff
changeset
|
105 | def start(self, fn, noEntries=0, revisions=None): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | Public slot to start the hg log command. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
109 | @param fn filename to show the log for (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | @param noEntries number of entries to show (integer) |
1274
442c748018c5
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1265
diff
changeset
|
111 | @param revisions revisions to show log for (list of strings) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | self.errorGroup.hide() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | QApplication.processEvents() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | self.intercept = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | self.filename = fn |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | self.dname, self.fname = self.vcs.splitPath(fn) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | # find the root of the repo |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
121 | self.repodir = self.dname |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
122 | while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
123 | self.repodir = os.path.dirname(self.repodir) |
1324
370e8b9cfc23
Fixed an issue introduced by the last fix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1319
diff
changeset
|
124 | if os.path.splitdrive(self.repodir)[1] == os.sep: |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
125 | return |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
127 | self.projectMode = (self.fname == "." and self.dname == self.repodir) |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
128 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | self.activateWindow() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | self.raise_() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | |
3242
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
132 | preargs = [] |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3284
diff
changeset
|
133 | args = self.vcs.initCommand(self.mode) |
1283
5766284d4393
Fixed a few issues in the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1274
diff
changeset
|
134 | if noEntries and self.mode == "log": |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
135 | args.append('--limit') |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
136 | args.append(str(noEntries)) |
207
3f889378dede
Added some code to inspect incoming patches as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
137 | if self.mode in ("incoming", "outgoing"): |
3f889378dede
Added some code to inspect incoming patches as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
138 | args.append("--newest-first") |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1746
diff
changeset
|
139 | if self.vcs.hasSubrepositories(): |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1746
diff
changeset
|
140 | args.append("--subrepos") |
204
61552f56788a
Fixed an issue introduced by the last change to Mercurial log browser and dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
141 | if self.mode == "log": |
61552f56788a
Fixed an issue introduced by the last change to Mercurial log browser and dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
142 | args.append('--copies') |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
143 | args.append('--style') |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
144 | if self.vcs.version >= (2, 1): |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
145 | args.append(os.path.join(os.path.dirname(__file__), |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
146 | "styles", "logDialogBookmarkPhase.style")) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3532
diff
changeset
|
147 | else: |
1019
d8a9697f78d1
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
148 | args.append(os.path.join(os.path.dirname(__file__), |
d8a9697f78d1
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
149 | "styles", "logDialogBookmark.style")) |
207
3f889378dede
Added some code to inspect incoming patches as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
150 | if self.mode == "incoming": |
214
eb1cf9398a3f
Added code to preview a Mercurial bundle file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
151 | if self.bundle: |
eb1cf9398a3f
Added code to preview a Mercurial bundle file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
152 | args.append(self.bundle) |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1746
diff
changeset
|
153 | elif not self.vcs.hasSubrepositories(): |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
154 | project = e5App().getObject("Project") |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
155 | self.vcs.bundleFile = os.path.join( |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
156 | project.getProjectManagementDir(), "hg-bundle.hg") |
3242
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
157 | if os.path.exists(self.vcs.bundleFile): |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
158 | os.remove(self.vcs.bundleFile) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
159 | preargs = args[:] |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
160 | preargs.append("--quiet") |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
161 | preargs.append('--bundle') |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
162 | preargs.append(self.vcs.bundleFile) |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
163 | args.append(self.vcs.bundleFile) |
1274
442c748018c5
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1265
diff
changeset
|
164 | if revisions: |
442c748018c5
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1265
diff
changeset
|
165 | for rev in revisions: |
442c748018c5
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1265
diff
changeset
|
166 | args.append("--rev") |
442c748018c5
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1265
diff
changeset
|
167 | args.append(rev) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
168 | if not self.projectMode: |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | args.append(self.filename) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
171 | if self.__hgClient: |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | self.inputGroup.setEnabled(False) |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
173 | self.inputGroup.hide() |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
174 | |
3242
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
175 | if preargs: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
176 | out, err = self.__hgClient.runcommand(preargs) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
177 | else: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
178 | err = "" |
1326
bf3fcb446da5
Reordered the output of some Mercurial dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1324
diff
changeset
|
179 | if err: |
bf3fcb446da5
Reordered the output of some Mercurial dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1324
diff
changeset
|
180 | self.__showError(err) |
3249
8f22bfa586b1
Another fix for the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3247
diff
changeset
|
181 | elif self.mode != "incoming" or \ |
3265
972d6be9dde7
Fixed issues in the Mercurial interface handling bundle files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3249
diff
changeset
|
182 | (self.vcs.bundleFile and |
3268
8bfa66a9138a
Fixed issues in the Mercurial interface handling bundle files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3265
diff
changeset
|
183 | os.path.exists(self.vcs.bundleFile)) or \ |
8bfa66a9138a
Fixed issues in the Mercurial interface handling bundle files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3265
diff
changeset
|
184 | self.bundle: |
3242
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
185 | out, err = self.__hgClient.runcommand(args) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
186 | if err: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
187 | self.__showError(err) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
188 | if out and self.isVisible(): |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
189 | for line in out.splitlines(True): |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
190 | self.__processOutputLine(line) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
191 | if self.__hgClient.wasCanceled(): |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
192 | break |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
193 | self.__finish() |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
194 | else: |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
195 | self.process.kill() |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
196 | |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
197 | self.process.setWorkingDirectory(self.repodir) |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
198 | |
3242
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
199 | if preargs: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
200 | process = QProcess() |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
201 | process.setWorkingDirectory(self.repodir) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
202 | process.start('hg', args) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
203 | procStarted = process.waitForStarted(5000) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
204 | if procStarted: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
205 | process.waitForFinished(30000) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
206 | |
3330
955e15f0ecce
Fixed an issue in the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
207 | if self.mode != "incoming" or \ |
955e15f0ecce
Fixed an issue in the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
208 | (self.vcs.bundleFile and |
955e15f0ecce
Fixed an issue in the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
209 | os.path.exists(self.vcs.bundleFile)) or \ |
3268
8bfa66a9138a
Fixed issues in the Mercurial interface handling bundle files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3265
diff
changeset
|
210 | self.bundle: |
3247
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
211 | self.process.start('hg', args) |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
212 | procStarted = self.process.waitForStarted(5000) |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
213 | if not procStarted: |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
214 | self.inputGroup.setEnabled(False) |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
215 | self.inputGroup.hide() |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
216 | E5MessageBox.critical( |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
217 | self, |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
218 | self.tr('Process Generation Error'), |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
219 | self.tr( |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
220 | 'The process {0} could not be started. ' |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
221 | 'Ensure, that it is in the search path.' |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
222 | ).format('hg')) |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
223 | else: |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
224 | self.__finish() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
226 | def __getParents(self, rev): |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
227 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
228 | Private method to get the parents of the currently viewed |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
229 | file/directory. |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
230 | |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
231 | @param rev revision number to get parents for (string) |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
232 | @return list of parent revisions (list of strings) |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
233 | """ |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
234 | errMsg = "" |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
235 | parents = [] |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
236 | |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
237 | if int(rev) > 0: |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3284
diff
changeset
|
238 | args = self.vcs.initCommand("parents") |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
239 | if self.mode == "incoming": |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
240 | if self.bundle: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
241 | args.append("--repository") |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
242 | args.append(self.bundle) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
243 | elif self.vcs.bundleFile and \ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
244 | os.path.exists(self.vcs.bundleFile): |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
245 | args.append("--repository") |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
246 | args.append(self.vcs.bundleFile) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
247 | args.append("--template") |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
248 | args.append("{rev}:{node|short}\n") |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
249 | args.append("-r") |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
250 | args.append(rev) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
251 | if not self.projectMode: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
252 | args.append(self.filename) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
253 | |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
254 | output = "" |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
255 | if self.__hgClient: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
256 | output, errMsg = self.__hgClient.runcommand(args) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
257 | else: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
258 | process = QProcess() |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
259 | process.setWorkingDirectory(self.repodir) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
260 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2581
diff
changeset
|
261 | procStarted = process.waitForStarted(5000) |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
262 | if procStarted: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
263 | finished = process.waitForFinished(30000) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
264 | if finished and process.exitCode() == 0: |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3284
diff
changeset
|
265 | output = str(process.readAllStandardOutput(), |
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3284
diff
changeset
|
266 | self.vcs.getEncoding(), 'replace') |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
267 | else: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
268 | if not finished: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
269 | errMsg = self.tr( |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
270 | "The hg process did not finish within 30s.") |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
271 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
272 | errMsg = self.tr("Could not start the hg executable.") |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
273 | |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
274 | if errMsg: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
275 | E5MessageBox.critical( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
276 | self, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
277 | self.tr("Mercurial Error"), |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
278 | errMsg) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
279 | |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
280 | if output: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
281 | parents = [p for p in output.strip().splitlines()] |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
282 | |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
283 | return parents |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
284 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
285 | def __procFinished(self, exitCode, exitStatus): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
286 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
287 | Private slot connected to the finished signal. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
288 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
289 | @param exitCode exit code of the process (integer) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | @param exitStatus exit status of the process (QProcess.ExitStatus) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | """ |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
292 | self.__finish() |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
293 | |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
294 | def __finish(self): |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
295 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
296 | Private slot called when the process finished or the user pressed |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
297 | the button. |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
298 | """ |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
299 | self.inputGroup.setEnabled(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | self.inputGroup.hide() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
301 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
302 | self.contents.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
303 | |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
304 | if not self.logEntries: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
305 | self.errors.append(self.tr("No log available for '{0}'") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
306 | .format(self.filename)) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
307 | self.errorGroup.show() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
308 | return |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
309 | |
212
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
310 | html = "" |
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
311 | |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
312 | if self.initialText: |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
313 | for line in self.initialText: |
212
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
314 | html += Utilities.html_encode(line.strip()) |
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
315 | html += '<br />\n' |
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
316 | html += '{0}<br/>\n'.format(80 * "=") |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
317 | |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
318 | for entry in self.logEntries: |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
319 | fileCopies = {} |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
320 | if entry["file_copies"]: |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
321 | for fentry in entry["file_copies"].split(", "): |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
322 | newName, oldName = fentry[:-1].split(" (") |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
323 | fileCopies[newName] = oldName |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
324 | |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
325 | rev, hexRev = entry["change"].split(":") |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
326 | dstr = '<p><b>{0} {1}</b>'.format(self.revString, entry["change"]) |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
327 | if entry["parents"]: |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
328 | parents = entry["parents"].split() |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
329 | else: |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
330 | parents = self.__getParents(rev) |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
331 | for parent in parents: |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
332 | url = QUrl() |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
333 | url.setScheme("file") |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
334 | url.setPath(self.filename) |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
335 | query = QByteArray() |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
336 | query.append(parent.split(":")[0]).append('_').append(rev) |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
337 | url.setEncodedQuery(query) |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
338 | dstr += ' [<a href="{0}" name="{1}" id="{1}">{2}</a>]'.format( |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
339 | url.toString(), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
340 | str(query, encoding="ascii"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
341 | self.tr('diff to {0}').format(parent), |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
342 | ) |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
343 | dstr += '<br />\n' |
212
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
344 | html += dstr |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
345 | |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
346 | if "phase" in entry: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
347 | html += self.tr("Phase: {0}<br />\n")\ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
348 | .format(entry["phase"]) |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
349 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
350 | html += self.tr("Branches: {0}<br />\n")\ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
351 | .format(entry["branches"]) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
352 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
353 | html += self.tr("Tags: {0}<br />\n").format(entry["tags"]) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
354 | |
1019
d8a9697f78d1
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
355 | if "bookmarks" in entry: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
356 | html += self.tr("Bookmarks: {0}<br />\n")\ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
357 | .format(entry["bookmarks"]) |
1019
d8a9697f78d1
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
358 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
359 | html += self.tr("Parents: {0}<br />\n")\ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
360 | .format(entry["parents"]) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
361 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
362 | html += self.tr('<i>Author: {0}</i><br />\n')\ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
363 | .format(entry["user"]) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
364 | |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
365 | date, time = entry["date"].split()[:2] |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
366 | html += self.tr('<i>Date: {0}, {1}</i><br />\n')\ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
367 | .format(date, time) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
368 | |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
369 | for line in entry["description"]: |
212
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
370 | html += Utilities.html_encode(line.strip()) |
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
371 | html += '<br />\n' |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
372 | |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
373 | if entry["file_adds"]: |
212
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
374 | html += '<br />\n' |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
375 | for f in entry["file_adds"].strip().split(", "): |
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
376 | if f in fileCopies: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
377 | html += self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
378 | 'Added {0} (copied from {1})<br />\n')\ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
379 | .format(Utilities.html_encode(f), |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
380 | Utilities.html_encode(fileCopies[f])) |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
381 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
382 | html += self.tr('Added {0}<br />\n')\ |
3036
30c81c9e88b8
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3034
diff
changeset
|
383 | .format(Utilities.html_encode(f)) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
384 | |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
385 | if entry["files_mods"]: |
212
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
386 | html += '<br />\n' |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
387 | for f in entry["files_mods"].strip().split(", "): |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
388 | html += self.tr('Modified {0}<br />\n')\ |
3036
30c81c9e88b8
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3034
diff
changeset
|
389 | .format(Utilities.html_encode(f)) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
390 | |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
391 | if entry["file_dels"]: |
212
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
392 | html += '<br />\n' |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
393 | for f in entry["file_dels"].strip().split(", "): |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
394 | html += self.tr('Deleted {0}<br />\n')\ |
3036
30c81c9e88b8
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3034
diff
changeset
|
395 | .format(Utilities.html_encode(f)) |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
396 | |
212
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
397 | html += '</p>{0}<br/>\n'.format(80 * "=") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
398 | |
212
19785b4c1bed
Performance tuning of the Mercurial log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
211
diff
changeset
|
399 | self.contents.setHtml(html) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
400 | tc = self.contents.textCursor() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
401 | tc.movePosition(QTextCursor.Start) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
402 | self.contents.setTextCursor(tc) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
403 | self.contents.ensureCursorVisible() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
404 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
405 | def __readStdout(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
406 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
407 | Private slot to handle the readyReadStandardOutput signal. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
408 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
409 | It reads the output of the process and inserts it into a buffer. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
410 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
411 | self.process.setReadChannel(QProcess.StandardOutput) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
412 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
413 | while self.process.canReadLine(): |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3284
diff
changeset
|
414 | s = str(self.process.readLine(), self.vcs.getEncoding(), 'replace') |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
415 | self.__processOutputLine(s) |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
416 | |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
417 | def __processOutputLine(self, line): |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
418 | """ |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
419 | Private method to process the lines of output. |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
420 | |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
421 | @param line output line to be processed (string) |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
422 | """ |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
423 | if line == "@@@\n": |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
424 | self.logEntries.append(self.lastLogEntry) |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
425 | self.lastLogEntry = {} |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
426 | self.fileCopies = {} |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
427 | else: |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
428 | try: |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
429 | key, value = line.split("|", 1) |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
430 | except ValueError: |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
431 | key = "" |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
432 | value = line |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
433 | if key == "change": |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
434 | self.endInitialText = True |
3284
8f7d97997243
Changed the Mercurial log dialog to always show a branch (if hg log doesn't give a branch, 'default' is used).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3268
diff
changeset
|
435 | if key in ("change", "tags", "parents", "user", "date", |
8f7d97997243
Changed the Mercurial log dialog to always show a branch (if hg log doesn't give a branch, 'default' is used).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3268
diff
changeset
|
436 | "file_copies", "file_adds", "files_mods", "file_dels", |
8f7d97997243
Changed the Mercurial log dialog to always show a branch (if hg log doesn't give a branch, 'default' is used).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3268
diff
changeset
|
437 | "bookmarks", "phase"): |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
438 | self.lastLogEntry[key] = value.strip() |
3284
8f7d97997243
Changed the Mercurial log dialog to always show a branch (if hg log doesn't give a branch, 'default' is used).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3268
diff
changeset
|
439 | elif key == "branches": |
8f7d97997243
Changed the Mercurial log dialog to always show a branch (if hg log doesn't give a branch, 'default' is used).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3268
diff
changeset
|
440 | if value.strip(): |
8f7d97997243
Changed the Mercurial log dialog to always show a branch (if hg log doesn't give a branch, 'default' is used).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3268
diff
changeset
|
441 | self.lastLogEntry[key] = value.strip() |
8f7d97997243
Changed the Mercurial log dialog to always show a branch (if hg log doesn't give a branch, 'default' is used).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3268
diff
changeset
|
442 | else: |
8f7d97997243
Changed the Mercurial log dialog to always show a branch (if hg log doesn't give a branch, 'default' is used).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3268
diff
changeset
|
443 | self.lastLogEntry[key] = "default" |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
444 | elif key == "description": |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
445 | self.lastLogEntry[key] = [value.strip()] |
209
94e34c41e823
Corrected the diff functions of the log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
446 | else: |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
447 | if self.endInitialText: |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
448 | self.lastLogEntry["description"].append(value.strip()) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
209
diff
changeset
|
449 | else: |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
450 | self.initialText.append(value) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
451 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
452 | def __readStderr(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
453 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
454 | Private slot to handle the readyReadStandardError signal. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
455 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
456 | It reads the error output of the process and inserts it into the |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
457 | error pane. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
458 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
459 | if self.process is not None: |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
460 | s = str(self.process.readAllStandardError(), |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3284
diff
changeset
|
461 | self.vcs.getEncoding(), 'replace') |
1246
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
462 | self.__showError(s) |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
463 | |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
464 | def __showError(self, out): |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
465 | """ |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
466 | Private slot to show some error. |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
467 | |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
468 | @param out error to be shown (string) |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
469 | """ |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
470 | self.errorGroup.show() |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
471 | self.errors.insertPlainText(out) |
5e9f6df3d1fc
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
472 | self.errors.ensureCursorVisible() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
473 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
474 | def __sourceChanged(self, url): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
475 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
476 | Private slot to handle the sourceChanged signal of the contents pane. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
477 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
478 | @param url the url that was clicked (QUrl) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
479 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
480 | filename = url.path() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
481 | if Utilities.isWindowsPlatform(): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
482 | if filename.startswith("/"): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
483 | filename = filename[1:] |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
484 | ver = bytes(url.encodedQuery()).decode() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
485 | v1, v2 = ver.split('_') |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
486 | if v1 == "" or v2 == "": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
487 | return |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
488 | self.contents.scrollToAnchor(ver) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
489 | |
2841
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
490 | if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): |
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
491 | self.vcs.hgSbsDiff(filename, revisions=(v1, v2)) |
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
492 | else: |
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
493 | if self.diff is None: |
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
494 | from .HgDiffDialog import HgDiffDialog |
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
495 | self.diff = HgDiffDialog(self.vcs) |
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
496 | self.diff.show() |
1f79e88f18b7
Added side-by-side capability to the Mercurial log dialog and log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2838
diff
changeset
|
497 | self.diff.start(filename, [v1, v2], self.bundle) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
498 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
499 | def on_passwordCheckBox_toggled(self, isOn): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
500 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
501 | Private slot to handle the password checkbox toggled. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
502 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
503 | @param isOn flag indicating the status of the check box (boolean) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
504 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
505 | if isOn: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
506 | self.input.setEchoMode(QLineEdit.Password) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
507 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
508 | self.input.setEchoMode(QLineEdit.Normal) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
509 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
510 | @pyqtSlot() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
511 | def on_sendButton_clicked(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
512 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
513 | Private slot to send the input to the hg process. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
514 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
515 | input = self.input.text() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
516 | input += os.linesep |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
517 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
518 | if self.passwordCheckBox.isChecked(): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
519 | self.errors.insertPlainText(os.linesep) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
520 | self.errors.ensureCursorVisible() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
521 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
522 | self.errors.insertPlainText(input) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
523 | self.errors.ensureCursorVisible() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
524 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
525 | self.process.write(input) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
526 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
527 | self.passwordCheckBox.setChecked(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
528 | self.input.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
529 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
530 | def on_input_returnPressed(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
531 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
532 | Private slot to handle the press of the return key in the input field. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
533 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
534 | self.intercept = True |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
535 | self.on_sendButton_clicked() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
536 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
537 | def keyPressEvent(self, evt): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
538 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
539 | Protected slot to handle a key press event. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
540 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
541 | @param evt the key press event (QKeyEvent) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
542 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
543 | if self.intercept: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
544 | self.intercept = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
545 | evt.accept() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
546 | return |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
547 | super(HgLogDialog, self).keyPressEvent(evt) |