Sun, 31 Dec 2017 16:52:09 +0100
Updated copyright for 2018.
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 | |
6048
82ad8ec9548c
Updated copyright for 2018.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5624
diff
changeset
|
3 | # Copyright (c) 2013 - 2018 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: |
5624
cdd346d8858b
Removed a bunch of __IGNORE_WARNING_M131__ markers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5587
diff
changeset
|
13 | str = unicode |
3484 | 14 | except NameError: |
2847
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 | |
3656
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3591
diff
changeset
|
19 | from PyQt5.QtCore import pyqtSlot, QProcess, QTimer |
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3591
diff
changeset
|
20 | from PyQt5.QtWidgets import QDialog, QDialogButtonBox |
2812
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 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | class HgSummaryDialog(QDialog, Ui_HgSummaryDialog): |
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 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
|
32 | directory state. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | def __init__(self, vcs, parent=None): |
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 | Constructor |
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 | @param vcs reference to the vcs object |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | @param parent parent widget (QWidget) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | """ |
2847
1843ef6e2656
Merge with default branch.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2827
diff
changeset
|
41 | super(HgSummaryDialog, self).__init__(parent) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | self.setupUi(self) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
44 | self.refreshButton = self.buttonBox.addButton( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
45 | self.tr("Refresh"), QDialogButtonBox.ActionRole) |
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.setToolTip( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
47 | self.tr("Press to refresh the summary display")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | self.refreshButton.setEnabled(False) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | self.vcs = vcs |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | self.vcs.committed.connect(self.__committed) |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
52 | |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
53 | self.process = QProcess() |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
54 | prepareProcess(self.process, language="C") |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
55 | self.process.finished.connect(self.__procFinished) |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
56 | self.process.readyReadStandardOutput.connect(self.__readStdout) |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
57 | self.process.readyReadStandardError.connect(self.__readStderr) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | def closeEvent(self, e): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | """ |
3591
2f2a4a76dd22
Corrected a bunch of source docu issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
61 | Protected slot implementing a close event handler. |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | @param e close event (QCloseEvent) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | if self.process is not None and \ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | self.process.state() != QProcess.NotRunning: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | self.process.terminate() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | QTimer.singleShot(2000, self.process.kill) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | self.process.waitForFinished(3000) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | e.accept() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
73 | def start(self, path, mq=False, largefiles=False): |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | 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
|
76 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | @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
|
78 | @param mq flag indicating to show the queue status as well (boolean) |
3359
6b6c224d67d6
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
79 | @param largefiles flag indicating to show the largefiles status as |
6b6c224d67d6
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
80 | well (boolean) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
81 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | self.errorGroup.hide() |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
83 | self.refreshButton.setEnabled(False) |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
84 | self.summary.clear() |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
85 | |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | self.__path = path |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | self.__mq = mq |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
88 | self.__largefiles = largefiles |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | |
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:
3218
diff
changeset
|
90 | args = self.vcs.initCommand("summary") |
3396
5320ecd70fdb
Added support for Mercurial queues summary.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3359
diff
changeset
|
91 | if self.vcs.canPull(): |
5320ecd70fdb
Added support for Mercurial queues summary.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3359
diff
changeset
|
92 | args.append("--remote") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | if self.__mq: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | args.append("--mq") |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
95 | if self.__largefiles: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
96 | args.append("--large") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | # find the root of the repo |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | repodir = self.__path |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
100 | 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
|
101 | repodir = os.path.dirname(repodir) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | 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
|
103 | return |
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 | if self.process: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | self.process.kill() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | self.process.setWorkingDirectory(repodir) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
109 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | self.__buffer = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | self.process.start('hg', args) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | procStarted = self.process.waitForStarted(5000) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | if not procStarted: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
115 | E5MessageBox.critical( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
116 | self, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
117 | self.tr('Process Generation Error'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
118 | self.tr( |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | 'The process {0} could not be started. ' |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | '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
|
121 | ).format('hg')) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
122 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | def __finish(self): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
125 | 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
|
126 | the button. |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | if self.process is not None and \ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | self.process.state() != QProcess.NotRunning: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | self.process.terminate() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | QTimer.singleShot(2000, self.process.kill) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | self.process.waitForFinished(3000) |
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 | self.refreshButton.setEnabled(True) |
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 | def on_buttonBox_clicked(self, button): |
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 | 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
|
139 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
140 | @param button button that was clicked (QAbstractButton) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
141 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | if button == self.buttonBox.button(QDialogButtonBox.Close): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | self.close() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
144 | elif button == self.refreshButton: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
145 | self.on_refreshButton_clicked() |
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 | def __procFinished(self, exitCode, exitStatus): |
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 | Private slot connected to the finished signal. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
150 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
151 | @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
|
152 | @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
|
153 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
154 | self.__processOutput(self.__buffer) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
155 | self.__finish() |
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 | def __readStdout(self): |
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 | Private slot to handle the readyReadStandardOutput signal. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | 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
|
162 | the contents pane. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
163 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | if self.process is not None: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | self.process.setReadChannel(QProcess.StandardOutput) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
167 | 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:
3218
diff
changeset
|
168 | line = str(self.process.readLine(), self.vcs.getEncoding(), |
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:
3218
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(), |
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:
3218
diff
changeset
|
181 | self.vcs.getEncoding(), 'replace') |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
182 | self.__showError(s) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
184 | def __showError(self, out): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
186 | Private slot to show some error. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
187 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
188 | @param out error to be shown (string) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
189 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | self.errorGroup.show() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | self.errors.insertPlainText(out) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | self.errors.ensureCursorVisible() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | @pyqtSlot() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | def on_refreshButton_clicked(self): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | Private slot to refresh the status display. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
198 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | self.start(self.__path, mq=self.__mq) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
200 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | def __committed(self): |
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 | 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
|
204 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
205 | if self.isVisible(): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | self.on_refreshButton_clicked() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | def __processOutput(self, output): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | 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
|
211 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
212 | @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
|
213 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
214 | infoDict = {} |
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 | # step 1: parse the output |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
217 | while output: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
218 | line = output.pop(0) |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
219 | if ':' not in line: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
220 | continue |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
221 | name, value = line.split(": ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | value = value.strip() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | if name == "parent": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | if " " in value: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
226 | parent, tags = value.split(" ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
227 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
228 | parent = value |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | tags = "" |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | rev, node = parent.split(":") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
232 | remarks = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
233 | if tags: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
234 | if " (empty repository)" in tags: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
235 | remarks.append("@EMPTY@") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
236 | tags = tags.replace(" (empty repository)", "") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
237 | if " (no revision checked out)" in tags: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
238 | remarks.append("@NO_REVISION@") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
239 | tags = tags.replace(" (no revision checked out)", "") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
240 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | tags = None |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
243 | value = infoDict.get(name, []) |
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 | if rev == "-1": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
246 | 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
|
247 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
248 | message = output.pop(0).strip() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
249 | 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
|
250 | elif name == "branch": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
251 | pass |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
252 | elif name == "bookmarks": |
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 == "commit": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
255 | stateDict = {} |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
256 | if "(" in value: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
257 | if value.startswith("("): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
258 | states = "" |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
259 | remark = value[1:-1] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
261 | states, remark = value.rsplit(" (", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
262 | remark = remark[:-1] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
263 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
264 | states = value |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
265 | remark = "" |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
266 | states = states.split(", ") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | for state in states: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
268 | if state: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
269 | count, category = state.split(" ") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
270 | stateDict[category] = count |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
271 | value = (stateDict, remark) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
272 | elif name == "update": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
273 | if value.endswith("(current)"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
274 | value = ("@CURRENT@", 0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
275 | elif value.endswith("(update)"): |
3218
c33689d92b14
Fixed an issue in the Mercurial summary dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
276 | value = ("@UPDATE@", int(value.split(" ", 1)[0]), 0) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
277 | elif value.endswith("(merge)"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
278 | parts = value.split(", ") |
3218
c33689d92b14
Fixed an issue in the Mercurial summary dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
279 | value = ("@MERGE@", int(parts[0].split(" ", 1)[0]), |
c33689d92b14
Fixed an issue in the Mercurial summary dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
280 | int(parts[1].split(" ", 1)[0])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
281 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
282 | value = ("@UNKNOWN@", 0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
283 | elif name == "remote": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
284 | if value == "(synced)": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
285 | value = (0, 0, 0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
286 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
287 | inc = incb = outg = outgb = 0 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
288 | for val in value.split(", "): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
289 | count, category = val.split(" ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | if category == "outgoing": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | outg = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
292 | elif category.endswith("incoming"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
293 | inc = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
294 | elif category == "incoming bookmarks": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | incb = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
296 | elif category == "outgoing bookmarks": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
297 | outgb = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
298 | value = (inc, outg, incb, outgb) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
299 | elif name == "mq": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | if value == "(empty queue)": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
301 | value = (0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
302 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
303 | applied = unapplied = 0 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
304 | for val in value.split(", "): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
305 | count, category = val.split(" ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
306 | if category == "applied": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
307 | applied = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
308 | elif category == "unapplied": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
309 | unapplied = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
310 | value = (applied, unapplied) |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
311 | elif name == "largefiles": |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
312 | if not value[0].isdigit(): |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
313 | value = 0 |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
314 | else: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
315 | value = int(value.split(None, 1)[0]) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
316 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
317 | # ignore unknown entries |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
318 | continue |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
319 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
320 | infoDict[name] = value |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
321 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
322 | # step 2: build the output |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
323 | if infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
324 | info = ["<table>"] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
325 | pindex = 0 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
326 | 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
|
327 | pindex += 1 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
328 | changeset = "{0}:{1}".format(rev, node) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
329 | if len(infoDict["parent"]) > 1: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
330 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
331 | "<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
|
332 | .format(pindex, changeset)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
333 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
334 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
335 | "<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
|
336 | .format(changeset)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
337 | if tags: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
338 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
339 | "<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
|
340 | .format('<br/>'.join(tags.split()))) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
341 | if message: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
342 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
343 | "<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
|
344 | .format(message)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
345 | if remarks: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
346 | rem = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
347 | if "@EMPTY@" in remarks: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
348 | rem.append(self.tr("empty repository")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
349 | if "@NO_REVISION@" in remarks: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
350 | rem.append(self.tr("no revision checked out")) |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
351 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
352 | "<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
|
353 | .format(", ".join(rem))) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
354 | if "branch" in infoDict: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
355 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
356 | "<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
|
357 | .format(infoDict["branch"])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
358 | if "bookmarks" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
359 | bookmarks = infoDict["bookmarks"].split() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
360 | for i in range(len(bookmarks)): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
361 | if bookmarks[i].startswith("*"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
362 | bookmarks[i] = "<b>{0}</b>".format(bookmarks[i]) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
363 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
364 | "<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
|
365 | .format('<br/>'.join(bookmarks))) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
366 | if "commit" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
367 | cinfo = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
368 | 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
|
369 | if category == "modified": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
370 | cinfo.append(self.tr("{0} modified").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
371 | elif category == "added": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
372 | cinfo.append(self.tr("{0} added").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
373 | elif category == "removed": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
374 | cinfo.append(self.tr("{0} removed").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
375 | elif category == "renamed": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
376 | cinfo.append(self.tr("{0} renamed").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
377 | elif category == "copied": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
378 | cinfo.append(self.tr("{0} copied").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
379 | elif category == "deleted": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
380 | cinfo.append(self.tr("{0} deleted").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
381 | elif category == "unknown": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
382 | cinfo.append(self.tr("{0} unknown").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
383 | elif category == "ignored": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
384 | cinfo.append(self.tr("{0} ignored").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
385 | 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
|
386 | cinfo.append( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
387 | self.tr("{0} unresolved").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
388 | elif category == "subrepos": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
389 | cinfo.append(self.tr("{0} subrepos").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
390 | remark = infoDict["commit"][1] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
391 | if remark == "merge": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
392 | cinfo.append(self.tr("Merge needed")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
393 | elif remark == "new branch": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
394 | cinfo.append(self.tr("New Branch")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
395 | elif remark == "head closed": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
396 | cinfo.append(self.tr("Head is closed")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
397 | elif remark == "clean": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
398 | cinfo.append(self.tr("No commit required")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
399 | elif remark == "new branch head": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
400 | cinfo.append(self.tr("New Branch Head")) |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
401 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
402 | "<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
|
403 | .format("<br/>".join(cinfo))) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
404 | if "update" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
405 | if infoDict["update"][0] == "@CURRENT@": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
406 | uinfo = self.tr("current") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
407 | elif infoDict["update"][0] == "@UPDATE@": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
408 | uinfo = self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
409 | "%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
|
410 | infoDict["update"][1]) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
411 | elif infoDict["update"][0] == "@MERGE@": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
412 | uinfo1 = self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
413 | "%n new changeset(s)", "", infoDict["update"][1]) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
414 | uinfo2 = self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
415 | "%n branch head(s)", "", infoDict["update"][2]) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
416 | uinfo = self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
417 | "{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
|
418 | "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
|
419 | .format(uinfo1, uinfo2) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
420 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
421 | uinfo = self.tr("unknown status") |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
422 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
423 | "<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
|
424 | .format(uinfo)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
425 | if "remote" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
426 | if infoDict["remote"] == (0, 0, 0, 0): |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
427 | rinfo = self.tr("synched") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
428 | else: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
429 | li = [] |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
430 | if infoDict["remote"][0]: |
5579
2afb925a84e6
Recompiled all resources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
431 | li.append(self.tr("1 or more incoming changesets")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
432 | if infoDict["remote"][1]: |
5579
2afb925a84e6
Recompiled all resources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
433 | li.append(self.tr("%n outgoing changeset(s)", "", |
2afb925a84e6
Recompiled all resources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
434 | infoDict["remote"][1])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
435 | if infoDict["remote"][2]: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
436 | li.append(self.tr("%n incoming bookmark(s)", "", |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
437 | infoDict["remote"][2])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
438 | if infoDict["remote"][3]: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
439 | li.append(self.tr("%n outgoing bookmark(s)", "", |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
440 | infoDict["remote"][3])) |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
441 | rinfo = "<br/>".join(li) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
442 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
443 | "<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
|
444 | .format(rinfo)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
445 | if "mq" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
446 | if infoDict["mq"] == (0, 0): |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
447 | qinfo = self.tr("empty queue") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
448 | else: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
449 | li = [] |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
450 | if infoDict["mq"][0]: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
451 | li.append(self.tr("{0} applied") |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
452 | .format(infoDict["mq"][0])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
453 | if infoDict["mq"][1]: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
454 | li.append(self.tr("{0} unapplied") |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
455 | .format(infoDict["mq"][1])) |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
456 | qinfo = "<br/>".join(li) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
457 | info.append(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
458 | "<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
|
459 | .format(qinfo)) |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
460 | if "largefiles" in infoDict: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
461 | if infoDict["largefiles"] == 0: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
462 | lfInfo = self.tr("No files to upload") |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
463 | else: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
464 | lfInfo = self.tr("%n file(s) to upload", "", |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
465 | infoDict["largefiles"]) |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
466 | info.append(self.tr( |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
467 | "<tr><td><b>Large Files</b></td><td>{0}</td></tr>") |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
468 | .format(lfInfo)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
469 | info.append("</table>") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
470 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
471 | info = [self.tr("<p>No status information available.</p>")] |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
472 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
473 | self.summary.insertHtml("\n".join(info)) |