Sun, 16 May 2021 20:07:24 +0200
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
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 | |
7923
91e843545d9a
Updated copyright for 2021.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7719
diff
changeset
|
3 | # Copyright (c) 2013 - 2021 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 | |
8318
962bce857696
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
11 | from PyQt6.QtCore import pyqtSlot |
962bce857696
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
12 | from PyQt6.QtWidgets import QDialog, QDialogButtonBox |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | from .Ui_HgSummaryDialog import Ui_HgSummaryDialog |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | class HgSummaryDialog(QDialog, Ui_HgSummaryDialog): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | 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
|
20 | directory state. |
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 | def __init__(self, vcs, parent=None): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | Constructor |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | @param vcs reference to the vcs object |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | @param parent parent widget (QWidget) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | """ |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
29 | super().__init__(parent) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | self.setupUi(self) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
32 | self.refreshButton = self.buttonBox.addButton( |
8143
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
33 | self.tr("Refresh"), QDialogButtonBox.ButtonRole.ActionRole) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2827
diff
changeset
|
34 | 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
|
35 | 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
|
36 | self.refreshButton.setEnabled(False) |
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 | self.vcs = vcs |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | self.vcs.committed.connect(self.__committed) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
41 | def start(self, mq=False, largefiles=False): |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | 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
|
44 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | @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
|
46 | @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
|
47 | well (boolean) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | 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
|
50 | 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
|
51 | 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
|
52 | |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | self.__mq = mq |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
54 | self.__largefiles = largefiles |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | |
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
|
56 | args = self.vcs.initCommand("summary") |
3396
5320ecd70fdb
Added support for Mercurial queues summary.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3359
diff
changeset
|
57 | if self.vcs.canPull(): |
5320ecd70fdb
Added support for Mercurial queues summary.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3359
diff
changeset
|
58 | args.append("--remote") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | if self.__mq: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | args.append("--mq") |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
61 | if self.__largefiles: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
62 | args.append("--large") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | |
7719
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
64 | client = self.vcs.getClient() |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
65 | output, error = client.runcommand(args) |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
66 | if error: |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
67 | self.__showError(error) |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
68 | else: |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
69 | self.__processOutput(output.splitlines()) |
2812
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 | self.refreshButton.setEnabled(True) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | def on_buttonBox_clicked(self, button): |
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 | 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
|
76 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | @param button button that was clicked (QAbstractButton) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | """ |
8143
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
79 | if button == self.buttonBox.button( |
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
80 | QDialogButtonBox.StandardButton.Close |
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
81 | ): |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | self.close() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | elif button == self.refreshButton: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | self.on_refreshButton_clicked() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | @pyqtSlot() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | def on_refreshButton_clicked(self): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | Private slot to refresh the status display. |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
91 | self.start(mq=self.__mq) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | def __committed(self): |
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 | 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
|
96 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | if self.isVisible(): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | self.on_refreshButton_clicked() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | |
7719
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
100 | def __showError(self, out): |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
101 | """ |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
102 | Private slot to show some error. |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
103 | |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
104 | @param out error to be shown (string) |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
105 | """ |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
106 | self.errorGroup.show() |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
107 | self.errors.insertPlainText(out) |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
108 | self.errors.ensureCursorVisible() |
a20dce3647ee
Mercurial interface: deleted several calls to the hg executable in favour of the Mercurial server (aka. client).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
109 | |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | def __processOutput(self, output): |
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 | 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
|
113 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | @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
|
115 | """ |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | infoDict = {} |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | # step 1: parse the output |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | while output: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | line = output.pop(0) |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
121 | if ':' not in line: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
122 | continue |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | name, value = line.split(": ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | value = value.strip() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
125 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | if name == "parent": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | if " " in value: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | parent, tags = value.split(" ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | parent = value |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | tags = "" |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | rev, node = parent.split(":") |
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 | remarks = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
135 | if tags: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
136 | if " (empty repository)" in tags: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
137 | remarks.append("@EMPTY@") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
138 | tags = tags.replace(" (empty repository)", "") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
139 | if " (no revision checked out)" in tags: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
140 | remarks.append("@NO_REVISION@") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
141 | tags = tags.replace(" (no revision checked out)", "") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | tags = None |
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 | value = infoDict.get(name, []) |
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 | if rev == "-1": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
148 | 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
|
149 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
150 | message = output.pop(0).strip() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
151 | value.append((int(rev), node, tags, message, remarks)) |
8228
772103b14c18
Applied some more code simplifications suggested by the new Simplify checker (Y114: use logical or for multiple if).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8220
diff
changeset
|
152 | elif name in ("branch", "bookmarks"): |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
153 | pass |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
154 | elif name == "commit": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
155 | stateDict = {} |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
156 | if "(" in value: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
157 | if value.startswith("("): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
158 | states = "" |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
159 | remark = value[1:-1] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | states, remark = value.rsplit(" (", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
162 | remark = remark[:-1] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
163 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | states = value |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | remark = "" |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | states = states.split(", ") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
167 | for state in states: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | if state: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | count, category = state.split(" ") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | stateDict[category] = count |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | value = (stateDict, remark) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | elif name == "update": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | if value.endswith("(current)"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | value = ("@CURRENT@", 0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
175 | elif value.endswith("(update)"): |
3218
c33689d92b14
Fixed an issue in the Mercurial summary dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
176 | 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
|
177 | elif value.endswith("(merge)"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | parts = value.split(", ") |
3218
c33689d92b14
Fixed an issue in the Mercurial summary dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
179 | 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
|
180 | int(parts[1].split(" ", 1)[0])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
181 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
182 | value = ("@UNKNOWN@", 0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | elif name == "remote": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
184 | if value == "(synced)": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | value = (0, 0, 0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
186 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
187 | inc = incb = outg = outgb = 0 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
188 | for val in value.split(", "): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
189 | count, category = val.split(" ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | if category == "outgoing": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | outg = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | elif category.endswith("incoming"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | inc = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | elif category == "incoming bookmarks": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | incb = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | elif category == "outgoing bookmarks": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | outgb = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
198 | value = (inc, outg, incb, outgb) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | elif name == "mq": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
200 | if value == "(empty queue)": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | value = (0, 0) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
202 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
203 | applied = unapplied = 0 |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
204 | for val in value.split(", "): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
205 | count, category = val.split(" ", 1) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | if category == "applied": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | applied = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | elif category == "unapplied": |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | unapplied = int(count) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | value = (applied, unapplied) |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
211 | elif name == "largefiles": |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
212 | if not value[0].isdigit(): |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
213 | value = 0 |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
214 | else: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
215 | 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
|
216 | else: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
217 | # ignore unknown entries |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
218 | continue |
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 | infoDict[name] = value |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
221 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | # step 2: build the output |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | if infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | info = ["<table>"] |
8220
006ee31b4835
Applied some more code simplifications suggested by the new Simplify checker (Y113: use enumerate()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
225 | for pindex, (rev, node, tags, message, remarks) in enumerate( |
006ee31b4835
Applied some more code simplifications suggested by the new Simplify checker (Y113: use enumerate()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
226 | infoDict["parent"], start=1 |
006ee31b4835
Applied some more code simplifications suggested by the new Simplify checker (Y113: use enumerate()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
227 | ): |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
228 | changeset = "{0}:{1}".format(rev, node) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | 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
|
230 | 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
|
231 | "<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
|
232 | .format(pindex, changeset)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
233 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
234 | 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
|
235 | "<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
|
236 | .format(changeset)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
237 | 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
|
238 | 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
|
239 | "<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
|
240 | .format('<br/>'.join(tags.split()))) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | 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
|
242 | 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
|
243 | "<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
|
244 | .format(message)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
245 | if remarks: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
246 | rem = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
247 | 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
|
248 | rem.append(self.tr("empty repository")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
249 | 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
|
250 | 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
|
251 | 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
|
252 | "<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
|
253 | .format(", ".join(rem))) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
254 | 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
|
255 | 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
|
256 | "<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
|
257 | .format(infoDict["branch"])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
258 | if "bookmarks" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
259 | bookmarks = infoDict["bookmarks"].split() |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | for i in range(len(bookmarks)): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
261 | if bookmarks[i].startswith("*"): |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
262 | 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
|
263 | 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
|
264 | "<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
|
265 | .format('<br/>'.join(bookmarks))) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
266 | if "commit" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | cinfo = [] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
268 | 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
|
269 | 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
|
270 | 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
|
271 | 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
|
272 | 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
|
273 | 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
|
274 | 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
|
275 | 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
|
276 | 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
|
277 | 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
|
278 | 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
|
279 | 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
|
280 | 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
|
281 | 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
|
282 | 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
|
283 | 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
|
284 | 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
|
285 | 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
|
286 | 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
|
287 | self.tr("{0} unresolved").format(count)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
288 | 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
|
289 | 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
|
290 | remark = infoDict["commit"][1] |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | 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
|
292 | cinfo.append(self.tr("Merge needed")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
293 | 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
|
294 | cinfo.append(self.tr("New Branch")) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | 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
|
296 | 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
|
297 | 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
|
298 | 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
|
299 | 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
|
300 | 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
|
301 | 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
|
302 | "<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
|
303 | .format("<br/>".join(cinfo))) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
304 | if "update" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
305 | 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
|
306 | uinfo = self.tr("current") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
307 | 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
|
308 | 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
|
309 | "%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
|
310 | infoDict["update"][1]) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
311 | 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
|
312 | 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
|
313 | "%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
|
314 | 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
|
315 | "%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
|
316 | 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
|
317 | "{0}<br/>{1}<br/>Merge required", |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
318 | "0 is changesets, 1 is branch heads" |
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
319 | ).format(uinfo1, uinfo2) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
320 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
321 | 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
|
322 | 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
|
323 | "<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
|
324 | .format(uinfo)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
325 | if "remote" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
326 | 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
|
327 | rinfo = self.tr("synched") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
328 | else: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
329 | li = [] |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
330 | if infoDict["remote"][0]: |
5579
2afb925a84e6
Recompiled all resources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
331 | 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
|
332 | if infoDict["remote"][1]: |
5579
2afb925a84e6
Recompiled all resources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
333 | li.append(self.tr("%n outgoing changeset(s)", "", |
2afb925a84e6
Recompiled all resources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
334 | infoDict["remote"][1])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
335 | 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
|
336 | 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
|
337 | infoDict["remote"][2])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
338 | 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
|
339 | 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
|
340 | infoDict["remote"][3])) |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
341 | 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
|
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>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
|
344 | .format(rinfo)) |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
345 | if "mq" in infoDict: |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
346 | 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
|
347 | qinfo = self.tr("empty queue") |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
348 | else: |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
349 | li = [] |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
350 | 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
|
351 | li.append(self.tr("{0} applied") |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
352 | .format(infoDict["mq"][0])) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
353 | 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
|
354 | li.append(self.tr("{0} unapplied") |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
355 | .format(infoDict["mq"][1])) |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
356 | 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
|
357 | 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
|
358 | "<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
|
359 | .format(qinfo)) |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
360 | if "largefiles" in infoDict: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
361 | if infoDict["largefiles"] == 0: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
362 | lfInfo = self.tr("No files to upload") |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
363 | else: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
364 | 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
|
365 | infoDict["largefiles"]) |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
366 | info.append(self.tr( |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
367 | "<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
|
368 | .format(lfInfo)) |
2812
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
369 | info.append("</table>") |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
370 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
371 | 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
|
372 | |
35c3302da595
Added forgotten files for the last change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
373 | self.summary.insertHtml("\n".join(info)) |