Wed, 01 Jan 2014 14:39:32 +0100
Updated copyright for 2014.
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
3161
06f57a834adf
Updated copyright for 2014.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3145
diff
changeset
|
3 | # Copyright (c) 2013 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing a dialog to show some summary information of the working |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | directory state. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | |
3145
a9de05d4a22f
# __IGNORE_WARNING__ added/ removed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3060
diff
changeset
|
11 | from __future__ import unicode_literals |
2847
1843ef6e2656
Merge with default branch.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2827
diff
changeset
|
12 | try: |
3145
a9de05d4a22f
# __IGNORE_WARNING__ added/ removed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3060
diff
changeset
|
13 | str = unicode # __IGNORE_WARNING__ |
2847
1843ef6e2656
Merge with default branch.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2827
diff
changeset
|
14 | except (NameError): |
1843ef6e2656
Merge with default branch.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2827
diff
changeset
|
15 | pass |
1843ef6e2656
Merge with default branch.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2827
diff
changeset
|
16 | |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | import os |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | |
2816
05aab5164d64
A little optimization for the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2813
diff
changeset
|
19 | from PyQt4.QtCore import pyqtSlot, QProcess, QTimer |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | from PyQt4.QtGui import QDialog, QDialogButtonBox |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | from E5Gui import E5MessageBox |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | |
2816
05aab5164d64
A little optimization for the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2813
diff
changeset
|
24 | from .HgUtilities import prepareProcess |
05aab5164d64
A little optimization for the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2813
diff
changeset
|
25 | |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | from .Ui_HgSummaryDialog import Ui_HgSummaryDialog |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | import Preferences |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | class HgSummaryDialog(QDialog, Ui_HgSummaryDialog): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | Class implementing a dialog to show some summary information of the working |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | directory state. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | def __init__(self, vcs, parent=None): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | Constructor |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | @param vcs reference to the vcs object |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | @param parent parent widget (QWidget) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | """ |
2847
1843ef6e2656
Merge with default branch.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2827
diff
changeset
|
43 | super(HgSummaryDialog, self).__init__(parent) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | self.setupUi(self) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
46 | self.refreshButton = self.buttonBox.addButton( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
47 | self.trUtf8("Refresh"), QDialogButtonBox.ActionRole) |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
48 | self.refreshButton.setToolTip( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
49 | self.trUtf8("Press to refresh the summary display")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | self.refreshButton.setEnabled(False) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | self.process = None |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | self.vcs = vcs |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | self.vcs.committed.connect(self.__committed) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | def closeEvent(self, e): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | Private slot implementing a close event handler. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | @param e close event (QCloseEvent) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | if self.process is not None and \ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | self.process.state() != QProcess.NotRunning: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | self.process.terminate() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | QTimer.singleShot(2000, self.process.kill) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | self.process.waitForFinished(3000) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | e.accept() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | def start(self, path, mq=False): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | Public slot to start the hg summary command. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | @param path path name of the working directory (string) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | @param mq flag indicating to show the queue status as well (boolean) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | self.errorGroup.hide() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | self.__path = path |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | self.__mq = mq |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
80 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
81 | args = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | args.append('summary') |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | self.vcs.addArguments(args, self.vcs.options['global']) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | args.append("--remote") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | if self.__mq: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | args.append("--mq") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | # find the root of the repo |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | repodir = self.__path |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | repodir = os.path.dirname(repodir) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | if os.path.splitdrive(repodir)[1] == os.sep: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | return |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | if self.process: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | self.process.kill() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | self.process = QProcess() |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
99 | prepareProcess(self.process, Preferences.getSystem("IOEncoding"), |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
100 | "C") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | self.process.finished.connect(self.__procFinished) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | self.process.readyReadStandardOutput.connect(self.__readStdout) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | self.process.readyReadStandardError.connect(self.__readStderr) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
105 | self.process.setWorkingDirectory(repodir) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | self.__buffer = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
109 | self.process.start('hg', args) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | procStarted = self.process.waitForStarted(5000) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | if not procStarted: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
112 | E5MessageBox.critical( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
113 | self, |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | self.trUtf8('Process Generation Error'), |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | self.trUtf8( |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | 'The process {0} could not be started. ' |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | 'Ensure, that it is in the search path.' |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | ).format('hg')) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | def __finish(self): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
122 | 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:
2827
diff
changeset
|
123 | the button. |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
125 | if self.process is not None and \ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | self.process.state() != QProcess.NotRunning: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | self.process.terminate() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | QTimer.singleShot(2000, self.process.kill) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | self.process.waitForFinished(3000) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | self.refreshButton.setEnabled(True) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | self.process = None |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
133 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
134 | def on_buttonBox_clicked(self, button): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
135 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
136 | Private slot called by a button of the button box clicked. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
137 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
138 | @param button button that was clicked (QAbstractButton) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
139 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
140 | if button == self.buttonBox.button(QDialogButtonBox.Close): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
141 | self.close() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | elif button == self.refreshButton: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | self.on_refreshButton_clicked() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
144 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
145 | def __procFinished(self, exitCode, exitStatus): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
146 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
147 | Private slot connected to the finished signal. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
148 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
149 | @param exitCode exit code of the process (integer) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
150 | @param exitStatus exit status of the process (QProcess.ExitStatus) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
151 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
152 | self.__processOutput(self.__buffer) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
153 | self.__finish() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
154 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
155 | def __readStdout(self): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
156 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
157 | Private slot to handle the readyReadStandardOutput signal. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
158 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
159 | It reads the output of the process, formats it and inserts it into |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | the contents pane. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
162 | if self.process is not None: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
163 | self.process.setReadChannel(QProcess.StandardOutput) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | while self.process.canReadLine(): |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
166 | line = str( |
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
167 | self.process.readLine(), |
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
168 | Preferences.getSystem("IOEncoding"), |
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
169 | 'replace') |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | self.__buffer.append(line) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | def __readStderr(self): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | Private slot to handle the readyReadStandardError signal. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
175 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
176 | It reads the error output of the process and inserts it into the |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
177 | error pane. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
179 | if self.process is not None: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | s = str(self.process.readAllStandardError(), |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
181 | Preferences.getSystem("IOEncoding"), |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
182 | 'replace') |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | self.__showError(s) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
184 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | def __showError(self, out): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
186 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
187 | Private slot to show some error. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
188 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
189 | @param out error to be shown (string) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | self.errorGroup.show() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | self.errors.insertPlainText(out) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | self.errors.ensureCursorVisible() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | @pyqtSlot() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | def on_refreshButton_clicked(self): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
198 | Private slot to refresh the status display. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
200 | self.refreshButton.setEnabled(False) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | self.summary.clear() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
202 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
203 | self.start(self.__path, mq=self.__mq) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
204 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
205 | def __committed(self): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | Private slot called after the commit has finished. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | if self.isVisible(): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | self.on_refreshButton_clicked() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
211 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
212 | def __processOutput(self, output): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
213 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
214 | Private method to process the output into nice readable text. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
215 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
216 | @param output output from the summary command (string) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
217 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
218 | infoDict = {} |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
219 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
220 | # step 1: parse the output |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
221 | while output: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | line = output.pop(0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | name, value = line.split(": ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | value = value.strip() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
226 | if name == "parent": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
227 | if " " in value: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
228 | parent, tags = value.split(" ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | parent = value |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | tags = "" |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
232 | rev, node = parent.split(":") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
233 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
234 | remarks = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
235 | if tags: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
236 | if " (empty repository)" in tags: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
237 | remarks.append("@EMPTY@") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
238 | tags = tags.replace(" (empty repository)", "") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
239 | if " (no revision checked out)" in tags: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
240 | remarks.append("@NO_REVISION@") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | tags = tags.replace(" (no revision checked out)", "") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
243 | tags = None |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
244 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
245 | value = infoDict.get(name, []) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
246 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
247 | if rev == "-1": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
248 | value.append((int(rev), node, tags, None, remarks)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
249 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
250 | message = output.pop(0).strip() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
251 | value.append((int(rev), node, tags, message, remarks)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
252 | elif name == "branch": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
253 | pass |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
254 | elif name == "bookmarks": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
255 | pass |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
256 | elif name == "commit": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
257 | stateDict = {} |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
258 | if "(" in value: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
259 | if value.startswith("("): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | states = "" |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
261 | remark = value[1:-1] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
262 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
263 | states, remark = value.rsplit(" (", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
264 | remark = remark[:-1] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
265 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
266 | states = value |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | remark = "" |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
268 | states = states.split(", ") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
269 | for state in states: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
270 | if state: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
271 | count, category = state.split(" ") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
272 | stateDict[category] = count |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
273 | value = (stateDict, remark) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
274 | elif name == "update": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
275 | if value.endswith("(current)"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
276 | value = ("@CURRENT@", 0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
277 | elif value.endswith("(update)"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
278 | value = ("@UPDATE@", value.split(" ", 1)[0], 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
279 | elif value.endswith("(merge)"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
280 | parts = value.split(", ") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
281 | value = ("@MERGE@", parts[0].split(" ", 1)[0], |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
282 | parts[1].split(" ", 1)[0]) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
283 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
284 | value = ("@UNKNOWN@", 0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
285 | elif name == "remote": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
286 | if value == "(synced)": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
287 | value = (0, 0, 0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
288 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
289 | inc = incb = outg = outgb = 0 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | for val in value.split(", "): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | count, category = val.split(" ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
292 | if category == "outgoing": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
293 | outg = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
294 | elif category.endswith("incoming"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | inc = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
296 | elif category == "incoming bookmarks": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
297 | incb = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
298 | elif category == "outgoing bookmarks": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
299 | outgb = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | value = (inc, outg, incb, outgb) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
301 | elif name == "mq": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
302 | if value == "(empty queue)": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
303 | value = (0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
304 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
305 | applied = unapplied = 0 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
306 | for val in value.split(", "): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
307 | count, category = val.split(" ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
308 | if category == "applied": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
309 | applied = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
310 | elif category == "unapplied": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
311 | unapplied = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
312 | value = (applied, unapplied) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
313 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
314 | # ignore unknown entries |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
315 | continue |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
316 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
317 | infoDict[name] = value |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
318 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
319 | # step 2: build the output |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
320 | if infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
321 | info = ["<table>"] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
322 | pindex = 0 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
323 | for rev, node, tags, message, remarks in infoDict["parent"]: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
324 | pindex += 1 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
325 | changeset = "{0}:{1}".format(rev, node) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
326 | if len(infoDict["parent"]) > 1: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
327 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
328 | "<tr><td><b>Parent #{0}</b></td><td>{1}</td></tr>") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
329 | .format(pindex, changeset)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
330 | else: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
331 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
332 | "<tr><td><b>Parent</b></td><td>{0}</td></tr>") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
333 | .format(changeset)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
334 | if tags: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
335 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
336 | "<tr><td><b>Tags</b></td><td>{0}</td></tr>") |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
337 | .format('<br/>'.join(tags.split()))) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
338 | if message: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
339 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
340 | "<tr><td><b>Commit Message</b></td><td>{0}</td></tr>") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
341 | .format(message)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
342 | if remarks: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
343 | rem = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
344 | if "@EMPTY@" in remarks: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
345 | rem.append(self.trUtf8("empty repository")) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
346 | if "@NO_REVISION@" in remarks: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
347 | rem.append(self.trUtf8("no revision checked out")) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
348 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
349 | "<tr><td><b>Remarks</b></td><td>{0}</td></tr>") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
350 | .format(", ".join(rem))) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
351 | if "branch" in infoDict: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
352 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
353 | "<tr><td><b>Branch</b></td><td>{0}</td></tr>") |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
354 | .format(infoDict["branch"])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
355 | if "bookmarks" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
356 | bookmarks = infoDict["bookmarks"].split() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
357 | for i in range(len(bookmarks)): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
358 | if bookmarks[i].startswith("*"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
359 | bookmarks[i] = "<b>{0}</b>".format(bookmarks[i]) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
360 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
361 | "<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>") |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
362 | .format('<br/>'.join(bookmarks))) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
363 | if "commit" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
364 | cinfo = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
365 | for category, count in infoDict["commit"][0].items(): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
366 | if category == "modified": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
367 | cinfo.append(self.trUtf8("{0} modified").format(count)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
368 | elif category == "added": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
369 | cinfo.append(self.trUtf8("{0} added").format(count)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
370 | elif category == "removed": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
371 | cinfo.append(self.trUtf8("{0} removed").format(count)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
372 | elif category == "renamed": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
373 | cinfo.append(self.trUtf8("{0} renamed").format(count)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
374 | elif category == "copied": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
375 | cinfo.append(self.trUtf8("{0} copied").format(count)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
376 | elif category == "deleted": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
377 | cinfo.append(self.trUtf8("{0} deleted").format(count)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
378 | elif category == "unknown": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
379 | cinfo.append(self.trUtf8("{0} unknown").format(count)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
380 | elif category == "ignored": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
381 | cinfo.append(self.trUtf8("{0} ignored").format(count)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
382 | elif category == "unresolved": |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
383 | cinfo.append( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
384 | self.trUtf8("{0} unresolved").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
385 | elif category == "subrepos": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
386 | cinfo.append(self.trUtf8("{0} subrepos").format(count)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
387 | remark = infoDict["commit"][1] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
388 | if remark == "merge": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
389 | cinfo.append(self.trUtf8("Merge needed")) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
390 | elif remark == "new branch": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
391 | cinfo.append(self.trUtf8("New Branch")) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
392 | elif remark == "head closed": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
393 | cinfo.append(self.trUtf8("Head is closed")) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
394 | elif remark == "clean": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
395 | cinfo.append(self.trUtf8("No commit required")) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
396 | elif remark == "new branch head": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
397 | cinfo.append(self.trUtf8("New Branch Head")) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
398 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
399 | "<tr><td><b>Commit Status</b></td><td>{0}</td></tr>") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
400 | .format("<br/>".join(cinfo))) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
401 | if "update" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
402 | if infoDict["update"][0] == "@CURRENT@": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
403 | uinfo = self.trUtf8("current") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
404 | elif infoDict["update"][0] == "@UPDATE@": |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
405 | uinfo = self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
406 | "%n new changeset(s)<br/>Update required", "", |
2827
9a7928798cfe
Updated translations and corrected some display strings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2816
diff
changeset
|
407 | infoDict["update"][1]) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
408 | elif infoDict["update"][0] == "@MERGE@": |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
409 | uinfo1 = self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
410 | "%n new changeset(s)", "", infoDict["update"][1]) |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
411 | uinfo2 = self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
412 | "%n branch head(s)", "", infoDict["update"][2]) |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
413 | uinfo = self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
414 | "{0}<br/>{1}<br/>Merge required", |
2827
9a7928798cfe
Updated translations and corrected some display strings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2816
diff
changeset
|
415 | "0 is changesets, 1 is branch heads")\ |
9a7928798cfe
Updated translations and corrected some display strings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2816
diff
changeset
|
416 | .format(uinfo1, uinfo2) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
417 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
418 | uinfo = self.trUtf8("unknown status") |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
419 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
420 | "<tr><td><b>Update Status</b></td><td>{0}</td></tr>") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
421 | .format(uinfo)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
422 | if "remote" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
423 | if infoDict["remote"] == (0, 0, 0, 0): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
424 | rinfo = self.trUtf8("synched") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
425 | else: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
426 | li = [] |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
427 | if infoDict["remote"][0]: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
428 | li.append(self.trUtf8("1 or more incoming")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
429 | if infoDict["remote"][1]: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
430 | li.append(self.trUtf8("{0} outgoing") |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
431 | .format(infoDict["remote"][1])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
432 | if infoDict["remote"][2]: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
433 | li.append(self.trUtf8("%n incoming bookmark(s)", "", |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
434 | infoDict["remote"][2])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
435 | if infoDict["remote"][3]: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
436 | li.append(self.trUtf8("%n outgoing bookmark(s)", "", |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
437 | infoDict["remote"][3])) |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
438 | rinfo = "<br/>".join(li) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
439 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
440 | "<tr><td><b>Remote Status</b></td><td>{0}</td></tr>") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
441 | .format(rinfo)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
442 | if "mq" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
443 | if infoDict["mq"] == (0, 0): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
444 | qinfo = self.trUtf8("empty queue") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
445 | else: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
446 | li = [] |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
447 | if infoDict["mq"][0]: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
448 | li.append(self.trUtf8("{0} applied") |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
449 | .format(infoDict["mq"][0])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
450 | if infoDict["mq"][1]: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
451 | li.append(self.trUtf8("{0} unapplied") |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
452 | .format(infoDict["mq"][1])) |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
453 | qinfo = "<br/>".join(li) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
454 | info.append(self.trUtf8( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
455 | "<tr><td><b>Queues Status</b></td><td>{0}</td></tr>") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
456 | .format(qinfo)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
457 | info.append("</table>") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
458 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
459 | info = [self.trUtf8("<p>No status information available.</p>")] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
460 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
461 | self.summary.insertHtml("\n".join(info)) |