Sat, 26 Apr 2025 12:34:32 +0200
MicroPython
- Added a configuration option to disable the support for the no longer produced Pimoroni Pico Wireless Pack.
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
11090
f5f5f5803935
Updated copyright for 2025.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11066
diff
changeset
|
3 | # Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing a dialog to browse the log history. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
10 | import collections |
8240
93b8a353c4bf
Applied some more code simplifications suggested by the new Simplify checker (Y105: use contextlib.suppress) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8234
diff
changeset
|
11 | import contextlib |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
12 | import os |
9152
8a68afaf1ba2
Started replacing the use of "QFileInfo()" with Python equivalents.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8881
diff
changeset
|
13 | import pathlib |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
14 | import re |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
16 | from PyQt6.QtCore import QDate, QPoint, QSize, Qt, pyqtSlot |
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
|
17 | from PyQt6.QtGui import ( |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
18 | QBrush, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
19 | QColor, |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
20 | QIcon, |
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
21 | QPainter, |
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
22 | QPalette, |
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
23 | QPen, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
24 | QPixmap, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
25 | QTextCursor, |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
26 | ) |
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
|
27 | from PyQt6.QtWidgets import ( |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
28 | QApplication, |
10215
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
29 | QDialog, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
30 | QDialogButtonBox, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
31 | QHeaderView, |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
32 | QInputDialog, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
33 | QLineEdit, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
34 | QMenu, |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
35 | QTreeWidgetItem, |
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
36 | QWidget, |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
37 | ) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | |
10928
46651e194fbe
Refactored some packages, modules and code to allow extracting the 'EricXxx' packages into a library project.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10922
diff
changeset
|
39 | from eric7 import EricUtilities, Preferences |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
40 | from eric7.EricGui import EricPixmapCache |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
41 | from eric7.EricGui.EricOverrideCursor import EricOverrideCursor |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
42 | from eric7.EricWidgets import EricFileDialog, EricMessageBox |
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
43 | from eric7.EricWidgets.EricApplication import ericApp |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
45 | from .HgDiffGenerator import HgDiffGenerator |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
46 | from .HgDiffHighlighter import HgDiffHighlighter |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
47 | from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
49 | COLORNAMES = [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
50 | "blue", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
51 | "darkgreen", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
52 | "red", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
53 | "green", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
54 | "darkblue", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
55 | "purple", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
56 | "cyan", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
57 | "olive", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
58 | "magenta", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
59 | "darkred", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
60 | "darkmagenta", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
61 | "darkcyan", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
62 | "gray", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
63 | "yellow", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
64 | ] |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
65 | COLORS = [str(QColor(x).name()) for x in COLORNAMES] |
7455
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
66 | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
67 | LIGHTCOLORS = [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
68 | "#aaaaff", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
69 | "#7faa7f", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
70 | "#ffaaaa", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
71 | "#aaffaa", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
72 | "#7f7faa", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
73 | "#ffaaff", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
74 | "#aaffff", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
75 | "#d5d579", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
76 | "#ffaaff", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
77 | "#d57979", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
78 | "#d579d5", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
79 | "#79d5d5", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
80 | "#d5d5d5", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
81 | "#d5d500", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
82 | ] |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
83 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
84 | |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
85 | class HgLogBrowserDialog(QWidget, Ui_HgLogBrowserDialog): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | Class implementing a dialog to browse the log history. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
89 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
90 | IconColumn = 0 |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
91 | BranchColumn = 1 |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
92 | RevisionColumn = 2 |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
93 | PhaseColumn = 3 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
94 | AuthorColumn = 4 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
95 | DateColumn = 5 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
96 | MessageColumn = 6 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
97 | TagsColumn = 7 |
5324
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
98 | BookmarksColumn = 8 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
99 | |
3317
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
100 | LargefilesCacheL = ".hglf/" |
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
101 | LargefilesCacheW = ".hglf\\" |
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
102 | PathSeparatorRe = re.compile(r"/|\\") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
103 | |
8659
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
104 | GraftedRe = re.compile(r"\(grafted from ([0-9a-fA-F]+)\)") |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
105 | GraftedTemplate = '(grafted from <a href="chg:{0}">{0}</a>)' |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
106 | |
3554
9ca56a89aec5
A liitle enhancement and a fix to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
107 | ClosedIndicator = " \u2612" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
108 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
109 | def __init__(self, vcs, mode="", parent=None): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | Constructor |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
112 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | @param vcs reference to the vcs object |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
114 | @type Hg |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
115 | @param mode mode of the dialog |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
116 | @type str (one of log, full_log, incoming, outgoing) |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
117 | @param parent parent widget |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
118 | @type QWidget |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | """ |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8151
diff
changeset
|
120 | super().__init__(parent) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | self.setupUi(self) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
122 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
123 | windowFlags = self.windowFlags() |
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:
7971
diff
changeset
|
124 | windowFlags |= Qt.WindowType.WindowContextHelpButtonHint |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
125 | self.setWindowFlags(windowFlags) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
126 | |
5486
a74fafdb67e0
Refined the layout of the Mercurial log browser dialog by introducing a splitter between the log and details part.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5477
diff
changeset
|
127 | self.mainSplitter.setSizes([300, 400]) |
a74fafdb67e0
Refined the layout of the Mercurial log browser dialog by introducing a splitter between the log and details part.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5477
diff
changeset
|
128 | self.mainSplitter.setStretchFactor(0, 1) |
a74fafdb67e0
Refined the layout of the Mercurial log browser dialog by introducing a splitter between the log and details part.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5477
diff
changeset
|
129 | self.mainSplitter.setStretchFactor(1, 2) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
130 | self.diffSplitter.setStretchFactor(0, 1) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
131 | self.diffSplitter.setStretchFactor(1, 2) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
132 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
133 | if not mode: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
134 | if vcs.getPlugin().getPreferences("LogBrowserShowFullLog"): |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
135 | mode = "full_log" |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
136 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
137 | mode = "log" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
138 | |
782
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
139 | if mode == "log": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
140 | self.setWindowTitle(self.tr("Mercurial Log")) |
782
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
141 | elif mode == "incoming": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
142 | self.setWindowTitle(self.tr("Mercurial Log (Incoming)")) |
782
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
143 | elif mode == "outgoing": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
144 | self.setWindowTitle(self.tr("Mercurial Log (Outgoing)")) |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
145 | elif mode == "full_log": |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
146 | self.setWindowTitle(self.tr("Mercurial Full Log")) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
147 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
148 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
149 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
150 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
151 | self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
152 | self.filesTree.header().setSortIndicator(0, Qt.SortOrder.AscendingOrder) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
153 | |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
154 | self.upButton.setIcon(EricPixmapCache.getIcon("1uparrow")) |
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
155 | self.downButton.setIcon(EricPixmapCache.getIcon("1downarrow")) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
156 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
157 | self.refreshButton = self.buttonBox.addButton( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
158 | self.tr("&Refresh"), QDialogButtonBox.ButtonRole.ActionRole |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
159 | ) |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
160 | self.refreshButton.setToolTip( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
161 | self.tr("Press to refresh the list of changesets") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
162 | ) |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
163 | self.refreshButton.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
164 | |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
165 | self.findPrevButton.setIcon(EricPixmapCache.getIcon("1leftarrow")) |
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
166 | self.findNextButton.setIcon(EricPixmapCache.getIcon("1rightarrow")) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
167 | self.__findBackwards = False |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
168 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
169 | self.modeComboBox.addItem(self.tr("Find"), "find") |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
170 | self.modeComboBox.addItem(self.tr("Filter"), "filter") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
171 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
172 | self.fieldCombo.addItem(self.tr("Revision"), "revision") |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
173 | self.fieldCombo.addItem(self.tr("Author"), "author") |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
174 | self.fieldCombo.addItem(self.tr("Message"), "message") |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
175 | self.fieldCombo.addItem(self.tr("File"), "file") |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
176 | self.fieldCombo.addItem(self.tr("Phase"), "phase") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
177 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
178 | font = Preferences.getEditorOtherFonts("MonospacedFont") |
7779
757334671130
Optimized the various diff panes by using QPlainTextEdit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7775
diff
changeset
|
179 | self.diffEdit.document().setDefaultFont(font) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
180 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
181 | self.diffHighlighter = HgDiffHighlighter(self.diffEdit.document()) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
182 | self.__diffGenerator = HgDiffGenerator(vcs, self) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
183 | self.__diffGenerator.finished.connect(self.__generatorFinished) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
184 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | self.vcs = vcs |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
186 | if mode in ("log", "incoming", "outgoing", "full_log"): |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
187 | if mode == "full_log": |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
188 | self.commandMode = "incoming" |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
189 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
190 | self.commandMode = mode |
1264
da42fd833a66
Fixed a little bug in the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1263
diff
changeset
|
191 | self.initialCommandMode = mode |
181
4af57f97c1bc
Added code to choose the way incoming and outgoing logs are shown.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
192 | else: |
215
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
193 | self.commandMode = "log" |
3287
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
194 | self.initialCommandMode = "log" |
3518
1d681235c1b4
Fixed the Mercurial command server client handling large data chunks on slow machines.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3516
diff
changeset
|
195 | self.__hgClient = vcs.getClient() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
196 | |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
197 | self.__detailsTemplate = self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
198 | "<table>" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
199 | "<tr><td><b>Revision</b></td><td>{0}</td></tr>" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
200 | "<tr><td><b>Date</b></td><td>{1}</td></tr>" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
201 | "<tr><td><b>Author</b></td><td>{2}</td></tr>" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
202 | "<tr><td><b>Branch</b></td><td>{3}</td></tr>" |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
203 | "{4}" |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
204 | "<tr><td><b>Message</b></td><td>{5}</td></tr>" |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
205 | "</table>" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
206 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
207 | self.__parentsTemplate = self.tr("<tr><td><b>Parents</b></td><td>{0}</td></tr>") |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
208 | self.__childrenTemplate = self.tr( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
209 | "<tr><td><b>Children</b></td><td>{0}</td></tr>" |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
210 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
211 | self.__tagsTemplate = self.tr("<tr><td><b>Tags</b></td><td>{0}</td></tr>") |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
212 | self.__latestTagTemplate = self.tr( |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
213 | "<tr><td><b>Latest Tag</b></td><td>{0}</td></tr>" |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
214 | ) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
215 | self.__bookmarksTemplate = self.tr( |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
216 | "<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>" |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
217 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
218 | |
3287
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
219 | self.__bundle = "" |
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
220 | self.__filename = "" |
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
221 | self.__isFile = False |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
222 | self.__selectedRevisions = [] |
4250
d3bd7c3dcb80
Fixed issues in the Subversion and Mercurial log browser windows.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4080
diff
changeset
|
223 | self.intercept = False |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
224 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
225 | self.__initData() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
226 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
227 | self.__allBranchesFilter = self.tr("All") |
10215
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
228 | self.__branchesFilterList = [] # list of branches to retrieve via hg |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
229 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | self.fromDate.setDisplayFormat("yyyy-MM-dd") |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | self.toDate.setDisplayFormat("yyyy-MM-dd") |
3287
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
232 | self.__resetUI() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
233 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
234 | # roles used in the log tree |
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:
7971
diff
changeset
|
235 | self.__messageRole = Qt.ItemDataRole.UserRole |
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:
7971
diff
changeset
|
236 | self.__changesRole = Qt.ItemDataRole.UserRole + 1 |
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:
7971
diff
changeset
|
237 | self.__edgesRole = Qt.ItemDataRole.UserRole + 2 |
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:
7971
diff
changeset
|
238 | self.__parentsRole = Qt.ItemDataRole.UserRole + 3 |
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:
7971
diff
changeset
|
239 | self.__latestTagRole = Qt.ItemDataRole.UserRole + 4 |
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:
7971
diff
changeset
|
240 | self.__incomingRole = Qt.ItemDataRole.UserRole + 5 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
241 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
242 | # roles used in the file tree |
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:
7971
diff
changeset
|
243 | self.__diffFileLineRole = Qt.ItemDataRole.UserRole |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
244 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
245 | self.flags = { |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
246 | "A": self.tr("Added"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
247 | "D": self.tr("Deleted"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
248 | "M": self.tr("Modified"), |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
249 | } |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
250 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
251 | self.phases = { |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
252 | "draft": self.tr("Draft"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
253 | "public": self.tr("Public"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
254 | "secret": self.tr("Secret"), |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
255 | } |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
256 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
257 | self.__dotRadius = 8 |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
258 | self.__rowHeight = 20 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
259 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
260 | self.logTree.setIconSize(QSize(100 * self.__rowHeight, self.__rowHeight)) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
261 | self.BookmarksColumn = self.logTree.columnCount() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
262 | self.logTree.headerItem().setText(self.BookmarksColumn, self.tr("Bookmarks")) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
263 | |
5448
1a86766ed19a
Change the Mercurial log browser such, that the current log entry is highlighted with a bold font.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5445
diff
changeset
|
264 | self.__logTreeNormalFont = self.logTree.font() |
1a86766ed19a
Change the Mercurial log browser such, that the current log entry is highlighted with a bold font.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5445
diff
changeset
|
265 | self.__logTreeNormalFont.setBold(False) |
1a86766ed19a
Change the Mercurial log browser such, that the current log entry is highlighted with a bold font.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5445
diff
changeset
|
266 | self.__logTreeBoldFont = self.logTree.font() |
1a86766ed19a
Change the Mercurial log browser such, that the current log entry is highlighted with a bold font.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5445
diff
changeset
|
267 | self.__logTreeBoldFont.setBold(True) |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
268 | self.__logTreeHasDarkBackground = ericApp().usesDarkPalette() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
269 | |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
270 | self.detailsEdit.anchorClicked.connect(self.__revisionClicked) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
271 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
272 | self.__initActionsMenu() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
273 | |
5450
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
274 | self.__finishCallbacks = [] |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
275 | if self.initialCommandMode == "full_log": |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
276 | self.__addFinishCallback(self.on_nextButton_clicked) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
277 | |
5450
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
278 | def __addFinishCallback(self, callback): |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
279 | """ |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
280 | Private method to add a method to be called once the process finished. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
281 | |
5450
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
282 | The callback methods are invoke in a FIFO style and are consumed. If |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
283 | a callback method needs to be called again, it must be added again. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
284 | |
5450
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
285 | @param callback callback method |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
286 | @type function |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
287 | """ |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
288 | if callback not in self.__finishCallbacks: |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
289 | self.__finishCallbacks.append(callback) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
290 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
291 | def __initActionsMenu(self): |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
292 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
293 | Private method to initialize the actions menu. |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
294 | """ |
10215
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
295 | # create the "View" submenu |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
296 | self.__viewMenu = QMenu(self.tr("View")) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
297 | self.__viewMenu.addAction( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
298 | self.tr("Select Branches"), lambda: self.__selectBranches(stateFilter=None) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
299 | ).setToolTip( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
300 | self.tr( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
301 | "Select the branches to be shown from a list of all branches and" |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
302 | " refresh the display" |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
303 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
304 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
305 | self.__viewMenu.addAction( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
306 | self.tr("Select Branches (active branches only)"), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
307 | lambda: self.__selectBranches(stateFilter=[""]), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
308 | ).setToolTip( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
309 | self.tr( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
310 | "Select the branches to be shown from a list of active branches and" |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
311 | " refresh the display" |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
312 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
313 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
314 | self.__viewMenu.addAction( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
315 | self.tr("Select Branches (inactive branches only)"), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
316 | lambda: self.__selectBranches(stateFilter=["I"]), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
317 | ).setToolTip( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
318 | self.tr( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
319 | "Select the branches to be shown from a list of inactive branches and" |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
320 | " refresh the display" |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
321 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
322 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
323 | self.__viewMenu.addAction( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
324 | self.tr("Select Branches (closed branches only)"), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
325 | lambda: self.__selectBranches(stateFilter=["C"]), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
326 | ).setToolTip( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
327 | self.tr( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
328 | "Select the branches to be shown from a list of closed branches and" |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
329 | " refresh the display" |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
330 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
331 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
332 | |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
333 | # create the main actions menu |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
334 | self.__actionsMenu = QMenu() |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
335 | self.__actionsMenu.setTearOffEnabled(True) |
7201
6b42677d7043
Modified sources to be in line with the minimum Qt/PyQt requirement (v 5.9.0).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7200
diff
changeset
|
336 | self.__actionsMenu.setToolTipsVisible(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
337 | |
10215
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
338 | self.__actionsMenu.addMenu(self.__viewMenu) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
339 | self.__actionsMenu.addSeparator() |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
340 | |
5104
0b9420dc1093
Removed the support for the obsolete transplant Mercuril extension and made v3.0 the minimum Mercurial version.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
341 | self.__graftAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
342 | EricPixmapCache.getIcon("vcsGraft"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
343 | self.tr("Copy Changesets"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
344 | self.__graftActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
345 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
346 | self.__graftAct.setToolTip( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
347 | self.tr("Copy the selected changesets to the current branch") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
348 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
349 | |
5496
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
350 | self.__mergeAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
351 | EricPixmapCache.getIcon("vcsMerge"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
352 | self.tr("Merge with Changeset"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
353 | self.__mergeActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
354 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
355 | self.__mergeAct.setToolTip( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
356 | self.tr("Merge the working directory with the selected changeset") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
357 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
358 | |
5104
0b9420dc1093
Removed the support for the obsolete transplant Mercuril extension and made v3.0 the minimum Mercurial version.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
359 | self.__phaseAct = self.__actionsMenu.addAction( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
360 | self.tr("Change Phase"), self.__phaseActTriggered |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
361 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
362 | self.__phaseAct.setToolTip( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
363 | self.tr("Change the phase of the selected revisions") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
364 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
365 | self.__phaseAct.setWhatsThis( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
366 | self.tr( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
367 | """<b>Change Phase</b>\n<p>This changes the phase of the""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
368 | """ selected revisions. The selected revisions have to have""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
369 | """ the same current phase.</p>""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
370 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
371 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
372 | |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
373 | self.__tagAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
374 | EricPixmapCache.getIcon("vcsTag"), self.tr("Tag"), self.__tagActTriggered |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
375 | ) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
376 | self.__tagAct.setToolTip(self.tr("Tag the selected revision")) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
377 | |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
378 | self.__closeHeadsAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
379 | EricPixmapCache.getIcon("closehead"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
380 | self.tr("Close Heads"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
381 | self.__closeHeadsActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
382 | ) |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
383 | self.__closeHeadsAct.setToolTip(self.tr("Close the selected heads")) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
384 | |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
385 | self.__switchAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
386 | EricPixmapCache.getIcon("vcsSwitch"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
387 | self.tr("Switch"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
388 | self.__switchActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
389 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
390 | self.__switchAct.setToolTip( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
391 | self.tr("Switch the working directory to the selected revision") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
392 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
393 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
394 | self.__actionsMenu.addSeparator() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
395 | |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
396 | self.__bookmarkAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
397 | EricPixmapCache.getIcon("addBookmark"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
398 | self.tr("Define Bookmark..."), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
399 | self.__bookmarkActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
400 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
401 | self.__bookmarkAct.setToolTip(self.tr("Bookmark the selected revision")) |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
402 | self.__bookmarkMoveAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
403 | EricPixmapCache.getIcon("moveBookmark"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
404 | self.tr("Move Bookmark..."), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
405 | self.__bookmarkMoveActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
406 | ) |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
407 | self.__bookmarkMoveAct.setToolTip( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
408 | self.tr("Move bookmark to the selected revision") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
409 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
410 | |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
411 | self.__actionsMenu.addSeparator() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
412 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
413 | self.__pullAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
414 | EricPixmapCache.getIcon("vcsUpdate"), |
11109
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
415 | self.tr("Pull Selected Changes"), |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
416 | lambda: self.__pullActTriggered(selectedOnly=True), |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
417 | ) |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
418 | self.__pullAct.setToolTip( |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
419 | self.tr("Pull selected changes from a remote repository") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
420 | ) |
11109
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
421 | self.__pullAllAct = self.__actionsMenu.addAction( |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
422 | EricPixmapCache.getIcon("vcsUpdate"), |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
423 | self.tr("Pull All Changes"), |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
424 | lambda: self.__pullActTriggered(selectedOnly=False), |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
425 | ) |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
426 | self.__pullAllAct.setToolTip( |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
427 | self.tr("Pull all changes from a remote repository") |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
428 | ) |
5104
0b9420dc1093
Removed the support for the obsolete transplant Mercuril extension and made v3.0 the minimum Mercurial version.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
429 | self.__lfPullAct = self.__actionsMenu.addAction( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
430 | self.tr("Pull Large Files"), self.__lfPullActTriggered |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
431 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
432 | self.__lfPullAct.setToolTip(self.tr("Pull large files for selected revisions")) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
433 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
434 | self.__actionsMenu.addSeparator() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
435 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
436 | self.__pushAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
437 | EricPixmapCache.getIcon("vcsCommit"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
438 | self.tr("Push Selected Changes"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
439 | self.__pushActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
440 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
441 | self.__pushAct.setToolTip( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
442 | self.tr( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
443 | "Push changes of the selected changeset and its ancestors" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
444 | " to a remote repository" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
445 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
446 | ) |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
447 | self.__pushAllAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
448 | EricPixmapCache.getIcon("vcsCommit"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
449 | self.tr("Push All Changes"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
450 | self.__pushAllActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
451 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
452 | self.__pushAllAct.setToolTip(self.tr("Push all changes to a remote repository")) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
453 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
454 | self.__actionsMenu.addSeparator() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
455 | |
5501
59ed7b2dd952
Started to add a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5496
diff
changeset
|
456 | self.__bundleAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
457 | EricPixmapCache.getIcon("vcsCreateChangegroup"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
458 | self.tr("Create Changegroup"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
459 | self.__bundleActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
460 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
461 | self.__bundleAct.setToolTip( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
462 | self.tr("Create a changegroup file containing the selected changesets") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
463 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
464 | self.__bundleAct.setWhatsThis( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
465 | self.tr( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
466 | """<b>Create Changegroup</b>\n<p>This creates a changegroup""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
467 | """ file containing the selected revisions. If no revisions""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
468 | """ are selected, all changesets will be bundled. If one""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
469 | """ revision is selected, it will be interpreted as the base""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
470 | """ revision. Otherwise the lowest revision will be used as""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
471 | """ the base revision and all other revision will be bundled.""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
472 | """ If the dialog is showing outgoing changesets, all""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
473 | """ selected changesets will be bundled.</p>""" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
474 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
475 | ) |
5514
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
476 | self.__unbundleAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
477 | EricPixmapCache.getIcon("vcsApplyChangegroup"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
478 | self.tr("Apply Changegroup"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
479 | self.__unbundleActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
480 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
481 | self.__unbundleAct.setToolTip( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
482 | self.tr("Apply the currently viewed changegroup file") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
483 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
484 | |
5501
59ed7b2dd952
Started to add a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5496
diff
changeset
|
485 | self.__actionsMenu.addSeparator() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
486 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
487 | self.__gpgSignAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
488 | EricPixmapCache.getIcon("changesetSign"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
489 | self.tr("Sign Revisions"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
490 | self.__gpgSignActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
491 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
492 | self.__gpgSignAct.setToolTip( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
493 | self.tr("Add a signature for the selected revisions") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
494 | ) |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
495 | self.__gpgVerifyAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
496 | EricPixmapCache.getIcon("changesetSignVerify"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
497 | self.tr("Verify Signatures"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
498 | self.__gpgVerifyActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
499 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
500 | self.__gpgVerifyAct.setToolTip( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
501 | self.tr("Verify all signatures there may be for the selected revision") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
502 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
503 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
504 | self.__actionsMenu.addSeparator() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
505 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
506 | self.__stripAct = self.__actionsMenu.addAction( |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
507 | EricPixmapCache.getIcon("fileDelete"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
508 | self.tr("Strip Changesets"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
509 | self.__stripActTriggered, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
510 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
511 | self.__stripAct.setToolTip(self.tr("Strip changesets from a repository")) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
512 | |
5503
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
513 | self.__actionsMenu.addSeparator() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
514 | |
5503
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
515 | self.__selectAllAct = self.__actionsMenu.addAction( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
516 | self.tr("Select All Entries"), self.__selectAllActTriggered |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
517 | ) |
5503
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
518 | self.__unselectAllAct = self.__actionsMenu.addAction( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
519 | self.tr("Deselect All Entries"), lambda: self.__selectAllActTriggered(False) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
520 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
521 | |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
522 | self.actionsButton.setIcon(EricPixmapCache.getIcon("actionsToolButton")) |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
523 | self.actionsButton.setMenu(self.__actionsMenu) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
524 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
525 | def __initData(self): |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
526 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
527 | Private method to (re-)initialize some data. |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
528 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
529 | self.__maxDate = QDate() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
530 | self.__minDate = QDate() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
531 | self.__filterLogsEnabled = True |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
532 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
533 | self.buf = [] # buffer for stdout |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
534 | self.diff = None |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
535 | self.__started = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
536 | self.__lastRev = 0 |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
537 | self.projectMode = False |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
538 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
539 | # attributes to store log graph data |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
540 | self.__revs = [] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
541 | self.__revColors = {} |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
542 | self.__revColor = 0 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
543 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
544 | self.__branchColors = {} |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
545 | |
7183
4ac1c9daa90b
HgStatusDialog: commitMerge and abortMerge actions added
Christos Sevastiadis <csevast@gmail.com>
parents:
7142
diff
changeset
|
546 | self.__projectWorkingDirParents = [] |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
547 | self.__projectBranch = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
548 | |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
549 | self.__childrenInfo = collections.defaultdict(list) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
550 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
551 | def closeEvent(self, e): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
552 | """ |
3591
2f2a4a76dd22
Corrected a bunch of source docu issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
553 | Protected slot implementing a close event handler. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
554 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
555 | @param e close event |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
556 | @type QCloseEvent |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
557 | """ |
7370
5fb53279f2df
Mercurial: removed some old code dealing with using the hg commandline executable instead of the command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
558 | if self.__hgClient.isExecuting(): |
5fb53279f2df
Mercurial: removed some old code dealing with using the hg commandline executable instead of the command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
559 | self.__hgClient.cancel() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
560 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
561 | self.vcs.getPlugin().setPreferences("LogBrowserGeometry", self.saveGeometry()) |
5488
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
562 | self.vcs.getPlugin().setPreferences( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
563 | "LogBrowserSplitterStates", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
564 | [ |
5488
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
565 | self.mainSplitter.saveState(), |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
566 | self.detailsSplitter.saveState(), |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
567 | self.diffSplitter.saveState(), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
568 | ], |
5488
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
569 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
570 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
571 | e.accept() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
572 | |
3283
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
573 | def show(self): |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
574 | """ |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
575 | Public slot to show the dialog. |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
576 | """ |
5488
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
577 | self.__reloadGeometry() |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
578 | self.__restoreSplitterStates() |
3283
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
579 | self.__resetUI() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
580 | |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8151
diff
changeset
|
581 | super().show() |
5488
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
582 | |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
583 | def __reloadGeometry(self): |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
584 | """ |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
585 | Private method to restore the geometry. |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
586 | """ |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
587 | geom = self.vcs.getPlugin().getPreferences("LogBrowserGeometry") |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
588 | if geom.isEmpty(): |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
589 | s = QSize(1000, 800) |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
590 | self.resize(s) |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
591 | else: |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
592 | self.restoreGeometry(geom) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
593 | |
5488
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
594 | def __restoreSplitterStates(self): |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
595 | """ |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
596 | Private method to restore the state of the various splitters. |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
597 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
598 | states = self.vcs.getPlugin().getPreferences("LogBrowserSplitterStates") |
5488
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
599 | if len(states) == 3: |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
600 | # we have three splitters |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
601 | self.mainSplitter.restoreState(states[0]) |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
602 | self.detailsSplitter.restoreState(states[1]) |
d3729abac667
Enhanced the Mercurial log browser window by saving and restoring the internal state (geometry and the three splitters).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5487
diff
changeset
|
603 | self.diffSplitter.restoreState(states[2]) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
604 | |
3283
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
605 | def __resetUI(self): |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
606 | """ |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
607 | Private method to reset the user interface. |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
608 | """ |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
609 | self.branchCombo.clear() |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
610 | self.fromDate.setDate(QDate.currentDate()) |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
611 | self.toDate.setDate(QDate.currentDate()) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
612 | self.fieldCombo.setCurrentIndex(self.fieldCombo.findData("message")) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
613 | self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences("LogLimit")) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
614 | self.stopCheckBox.setChecked( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
615 | self.vcs.getPlugin().getPreferences("StopLogOnCopy") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
616 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
617 | |
3283
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
618 | if self.initialCommandMode in ("incoming", "outgoing"): |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
619 | self.nextButton.setEnabled(False) |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
620 | self.limitSpinBox.setEnabled(False) |
3287
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
621 | else: |
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
622 | self.nextButton.setEnabled(True) |
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
623 | self.limitSpinBox.setEnabled(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
624 | |
3283
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
625 | self.logTree.clear() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
626 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
627 | if self.initialCommandMode == "full_log": |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
628 | self.commandMode = "incoming" |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
629 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
630 | self.commandMode = self.initialCommandMode |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
631 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
632 | def __resizeColumnsLog(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
633 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
634 | Private method to resize the log tree columns. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
635 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
636 | self.logTree.header().resizeSections(QHeaderView.ResizeMode.ResizeToContents) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
637 | self.logTree.header().setStretchLastSection(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
638 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
639 | def __resizeColumnsFiles(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
640 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
641 | Private method to resize the changed files tree columns. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
642 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
643 | self.filesTree.header().resizeSections(QHeaderView.ResizeMode.ResizeToContents) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
644 | self.filesTree.header().setStretchLastSection(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
645 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
646 | def __resortFiles(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
647 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
648 | Private method to resort the changed files tree. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
649 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
650 | sortColumn = self.filesTree.sortColumn() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
651 | self.filesTree.sortItems(1, self.filesTree.header().sortIndicatorOrder()) |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
652 | self.filesTree.sortItems( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
653 | sortColumn, self.filesTree.header().sortIndicatorOrder() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
654 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
655 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
656 | def __getColor(self, n): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
657 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
658 | Private method to get the (rotating) name of the color given an index. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
659 | |
7455
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
660 | @param n color index |
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
661 | @type int |
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
662 | @return color name |
7489
6543bcd150fd
Updated source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7455
diff
changeset
|
663 | @rtype str |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
664 | """ |
7455
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
665 | if self.__logTreeHasDarkBackground: |
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
666 | return LIGHTCOLORS[n % len(LIGHTCOLORS)] |
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
667 | else: |
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
668 | return COLORS[n % len(COLORS)] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
669 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
670 | def __branchColor(self, branchName): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
671 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
672 | Private method to calculate a color for a given branch name. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
673 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
674 | @param branchName name of the branch |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
675 | @type str |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
676 | @return name of the color to use |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
677 | @rtype str |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
678 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
679 | if branchName not in self.__branchColors: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
680 | self.__branchColors[branchName] = self.__getColor(len(self.__branchColors)) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
681 | return self.__branchColors[branchName] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
682 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
683 | def __generateEdges(self, rev, parents): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
684 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
685 | Private method to generate edge info for the give data. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
686 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
687 | @param rev revision to calculate edge info for |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
688 | @type int |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
689 | @param parents list of parent revisions |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
690 | @type list of int |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
691 | @return tuple containing the column and color index for |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
692 | the given node and a list of tuples indicating the edges |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
693 | between the given node and its parents |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
694 | @rtype tuple of (int, int, [(int, int, int), ...]) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
695 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
696 | if rev not in self.__revs: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
697 | # new head |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
698 | self.__revs.append(rev) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
699 | self.__revColors[rev] = self.__revColor |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
700 | self.__revColor += 1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
701 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
702 | col = self.__revs.index(rev) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
703 | color = self.__revColors.pop(rev) |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5587
diff
changeset
|
704 | nextRevs = self.__revs[:] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
705 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
706 | # add parents to next |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5587
diff
changeset
|
707 | addparents = [p for p in parents if p not in nextRevs] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
708 | nextRevs[col : col + 1] = addparents |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
709 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
710 | # set colors for the parents |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
711 | for i, p in enumerate(addparents): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
712 | if not i: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
713 | self.__revColors[p] = color |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
714 | else: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
715 | self.__revColors[p] = self.__revColor |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
716 | self.__revColor += 1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
717 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
718 | # add edges to the graph |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
719 | edges = [] |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
720 | if parents[0] != -1: |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
721 | for ecol, erev in enumerate(self.__revs): |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5587
diff
changeset
|
722 | if erev in nextRevs: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
723 | edges.append((ecol, nextRevs.index(erev), self.__revColors[erev])) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
724 | elif erev == rev: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
725 | for p in parents: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
726 | edges.append((ecol, nextRevs.index(p), self.__revColors[p])) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
727 | |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5587
diff
changeset
|
728 | self.__revs = nextRevs |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
729 | return col, color, edges |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
730 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
731 | def __generateIcon( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
732 | self, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
733 | column, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
734 | bottomedges, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
735 | topedges, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
736 | dotColor, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
737 | currentRev, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
738 | closed, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
739 | isPushableDraft, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
740 | ): |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
741 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
742 | Private method to generate an icon containing the revision tree for the |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
743 | given data. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
744 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
745 | @param column column index of the revision |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
746 | @type int |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
747 | @param bottomedges list of edges for the bottom of the node |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
748 | @type list of tuples of (int, int, int) |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
749 | @param topedges list of edges for the top of the node |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
750 | @type list of tuples of (int, int, int) |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
751 | @param dotColor color to be used for the dot |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
752 | @type QColor |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
753 | @param currentRev flag indicating to draw the icon for the |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
754 | current revision |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
755 | @type bool |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
756 | @param closed flag indicating to draw an icon for a closed |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
757 | branch |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
758 | @type bool |
7971
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
759 | @param isPushableDraft flag indicating an entry of phase 'draft', |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
760 | that can by pushed |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
761 | @type bool |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
762 | @return icon for the node |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
763 | @rtype QIcon |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
764 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
765 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
766 | def col2x(col, radius): |
244
30be2b4a9721
Added a menu to the highlighting styles config page to change individual aspects of a font only.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
243
diff
changeset
|
767 | """ |
30be2b4a9721
Added a menu to the highlighting styles config page to change individual aspects of a font only.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
243
diff
changeset
|
768 | Local function to calculate a x-position for a column. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
769 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
770 | @param col column number |
10458
2074b8393649
Corrected some code documentation style and code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
771 | @type int |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
772 | @param radius radius of the indicator circle |
10458
2074b8393649
Corrected some code documentation style and code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
773 | @type int |
244
30be2b4a9721
Added a menu to the highlighting styles config page to change individual aspects of a font only.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
243
diff
changeset
|
774 | """ |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
775 | return int(1.2 * radius) * col + radius // 2 + 3 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
776 | |
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:
7971
diff
changeset
|
777 | textColor = self.logTree.palette().color(QPalette.ColorRole.Text) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
778 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
779 | radius = self.__dotRadius |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
780 | w = len(bottomedges) * radius + 20 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
781 | h = self.__rowHeight |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
782 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
783 | dot_x = col2x(column, radius) - radius // 2 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
784 | dot_y = h // 2 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
785 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
786 | pix = QPixmap(w, h) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
787 | pix.fill(QColor(0, 0, 0, 0)) # draw transparent background |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
788 | painter = QPainter(pix) |
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:
7971
diff
changeset
|
789 | painter.setRenderHint(QPainter.RenderHint.Antialiasing) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
790 | |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
791 | # draw the revision history lines |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
792 | for y1, y2, lines in ((0, h, bottomedges), (-h, 0, topedges)): |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
793 | if lines: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
794 | for start, end, ecolor in lines: |
7455
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
795 | lpen = QPen(QColor(self.__getColor(ecolor))) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
796 | lpen.setWidth(2) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
797 | painter.setPen(lpen) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
798 | x1 = col2x(start, radius) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
799 | x2 = col2x(end, radius) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
800 | painter.drawLine(x1, dot_y + y1, x2, dot_y + y2) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
801 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
802 | penradius = 1 |
7455
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
803 | pencolor = textColor |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
804 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
805 | dot_y = (h // 2) - radius // 2 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
806 | |
7455
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
807 | # draw an indicator for the revision |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
808 | if currentRev: |
7455
9d0852f0bb2c
GitLogBrowserDialog, HgLogBrowserDialog: added log tree colors to be used with dark backgrounds.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7454
diff
changeset
|
809 | # enlarge for the current revision |
1637
b60eb2fdbaea
Improved the indication of the current branches head in the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1608
diff
changeset
|
810 | delta = 1 |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
811 | radius += 2 * delta |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
812 | dot_y -= delta |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
813 | dot_x -= delta |
1637
b60eb2fdbaea
Improved the indication of the current branches head in the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1608
diff
changeset
|
814 | penradius = 3 |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
815 | painter.setBrush(dotColor) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
816 | pen = QPen(pencolor) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
817 | pen.setWidth(penradius) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
818 | painter.setPen(pen) |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
819 | if closed: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
820 | painter.drawRect(dot_x - 2, dot_y + 1, radius + 4, radius - 2) |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
821 | elif self.commandMode in ("incoming", "outgoing"): |
781
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
822 | offset = radius // 2 |
6986
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
823 | if self.commandMode == "incoming": |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
824 | # incoming: draw a down arrow |
6986
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
825 | painter.drawConvexPolygon( |
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
826 | QPoint(dot_x, dot_y), |
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
827 | QPoint(dot_x + 2 * offset, dot_y), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
828 | QPoint(dot_x + offset, dot_y + 2 * offset), |
6986
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
829 | ) |
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
830 | else: |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
831 | # outgoing: draw an up arrow |
6986
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
832 | painter.drawConvexPolygon( |
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
833 | QPoint(dot_x + offset, dot_y), |
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
834 | QPoint(dot_x, dot_y + 2 * offset), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
835 | QPoint(dot_x + 2 * offset, dot_y + 2 * offset), |
6986
23886c1dd3d0
HgLogBrowserDialog: changed the icon for incoming and outgoing changesets to make the changeset type more distinguishable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
836 | ) |
781
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
837 | else: |
7971
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
838 | if isPushableDraft: |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
839 | # 'draft' phase: draw an up arrow like outgoing, |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
840 | # if it can be pushed |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
841 | offset = radius // 2 |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
842 | painter.drawConvexPolygon( |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
843 | QPoint(dot_x + offset, dot_y), |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
844 | QPoint(dot_x, dot_y + 2 * offset), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
845 | QPoint(dot_x + 2 * offset, dot_y + 2 * offset), |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
846 | ) |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
847 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
848 | painter.drawEllipse(dot_x, dot_y, radius, radius) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
849 | painter.end() |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
850 | return QIcon(pix) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
851 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
852 | def __getParents(self, rev): |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
853 | """ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
854 | Private method to get the parents of the currently viewed |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
855 | file/directory. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
856 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
857 | @param rev revision number to get parents for |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
858 | @type str |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
859 | @return list of parent revisions |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
860 | @rtype list of int |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
861 | """ |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
862 | errMsg = "" |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
863 | parents = [-1] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
864 | |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
865 | if int(rev) > 0: |
10214 | 866 | args = self.vcs.initCommand("log") |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
867 | if self.commandMode == "incoming": |
3287
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
868 | if self.__bundle: |
10214 | 869 | args.extend(["--repository", self.__bundle]) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
870 | elif self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): |
10214 | 871 | args.extend(["--repository", self.vcs.bundleFile]) |
872 | args.extend(["--template", "{rev}\n", "-r", "parents({0})".format(rev)]) | |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
873 | if not self.projectMode: |
3287
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
874 | args.append(self.__filename) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
875 | |
7370
5fb53279f2df
Mercurial: removed some old code dealing with using the hg commandline executable instead of the command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
876 | output, errMsg = self.__hgClient.runcommand(args) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
877 | |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
878 | if output: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
879 | parents = [int(p) for p in output.strip().splitlines()] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
880 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
881 | return parents |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
882 | |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
883 | def __identifyProject(self): |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
884 | """ |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
885 | Private method to determine the revision of the project directory. |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
886 | """ |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
887 | errMsg = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
888 | |
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:
3287
diff
changeset
|
889 | args = self.vcs.initCommand("identify") |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
890 | args.append("-nb") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
891 | |
7370
5fb53279f2df
Mercurial: removed some old code dealing with using the hg commandline executable instead of the command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
892 | output, errMsg = self.__hgClient.runcommand(args) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
893 | |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
894 | if errMsg: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
895 | EricMessageBox.critical(self, self.tr("Mercurial Error"), errMsg) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
896 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
897 | if output: |
2544
3868561e3962
Fixed an issue introduced by the last changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2543
diff
changeset
|
898 | outputList = output.strip().split(None, 1) |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
899 | if len(outputList) == 2: |
7183
4ac1c9daa90b
HgStatusDialog: commitMerge and abortMerge actions added
Christos Sevastiadis <csevast@gmail.com>
parents:
7142
diff
changeset
|
900 | outputRevs = outputList[0].strip() |
4ac1c9daa90b
HgStatusDialog: commitMerge and abortMerge actions added
Christos Sevastiadis <csevast@gmail.com>
parents:
7142
diff
changeset
|
901 | if outputRevs.endswith("+"): |
4ac1c9daa90b
HgStatusDialog: commitMerge and abortMerge actions added
Christos Sevastiadis <csevast@gmail.com>
parents:
7142
diff
changeset
|
902 | outputRevs = outputRevs[:-1] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
903 | self.__projectWorkingDirParents = outputRevs.split("+") |
7187
11b0c7802a70
HgLogBrowserDialog: fixed the patch submitted by Christos.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7183
diff
changeset
|
904 | else: |
11b0c7802a70
HgLogBrowserDialog: fixed the patch submitted by Christos.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7183
diff
changeset
|
905 | self.__projectWorkingDirParents = [outputRevs] |
2642
c9f965bd21d2
Fixed an issue in the Mercurial log browser dialog causing the 'Copy Changeset' button not being updated correctly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2581
diff
changeset
|
906 | self.__projectBranch = outputList[1].strip() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
907 | |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
908 | def __getClosedBranches(self): |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
909 | """ |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
910 | Private method to get the list of closed branches. |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
911 | """ |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
912 | self.__closedBranchesRevs = [] |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
913 | errMsg = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
914 | |
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:
3287
diff
changeset
|
915 | args = self.vcs.initCommand("branches") |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
916 | args.append("--closed") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
917 | |
7370
5fb53279f2df
Mercurial: removed some old code dealing with using the hg commandline executable instead of the command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
918 | output, errMsg = self.__hgClient.runcommand(args) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
919 | |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
920 | if errMsg: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
921 | EricMessageBox.critical(self, self.tr("Mercurial Error"), errMsg) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
922 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
923 | if output: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
924 | for line in output.splitlines(): |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
925 | if line.strip().endswith("(closed)"): |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
926 | parts = line.split() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
927 | self.__closedBranchesRevs.append(parts[-2].split(":", 1)[0]) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
928 | |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
929 | def __getHeads(self): |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
930 | """ |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
931 | Private method to get the list of all heads. |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
932 | """ |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
933 | self.__headRevisions = [] |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
934 | errMsg = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
935 | |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
936 | args = self.vcs.initCommand("heads") |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
937 | args.append("--closed") |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
938 | args.append("--template") |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
939 | args.append("{rev}\n") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
940 | |
7370
5fb53279f2df
Mercurial: removed some old code dealing with using the hg commandline executable instead of the command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
941 | output, errMsg = self.__hgClient.runcommand(args) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
942 | |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
943 | if errMsg: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
944 | EricMessageBox.critical(self, self.tr("Mercurial Error"), errMsg) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
945 | |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
946 | if output: |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
947 | for line in output.splitlines(): |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
948 | line = line.strip() |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
949 | if line: |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
950 | self.__headRevisions.append(line) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
951 | |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
952 | def __getRevisionOfTag(self, tag): |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
953 | """ |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
954 | Private method to get the revision of a tag. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
955 | |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
956 | @param tag tag name |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
957 | @type str |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
958 | @return tuple containing the revision and changeset ID |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
959 | @rtype tuple of (str, str) |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
960 | """ |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
961 | errMsg = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
962 | |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
963 | args = self.vcs.initCommand("tags") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
964 | |
7370
5fb53279f2df
Mercurial: removed some old code dealing with using the hg commandline executable instead of the command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
965 | output, errMsg = self.__hgClient.runcommand(args) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
966 | |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
967 | if errMsg: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
968 | EricMessageBox.critical(self, self.tr("Mercurial Error"), errMsg) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
969 | |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
970 | res = ("", "") |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
971 | if output: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
972 | for line in output.splitlines(): |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
973 | if line.strip(): |
8243
cc717c2ae956
Applied some more code simplifications suggested by the new Simplify checker (Y105: use contextlib.suppress) (batch 2).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8240
diff
changeset
|
974 | with contextlib.suppress(ValueError): |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
975 | name, rev = line.strip().rsplit(None, 1) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
976 | if name == tag: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
977 | res = tuple(rev.split(":", 1)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
978 | break |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
979 | |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
980 | return res |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
981 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
982 | def __generateLogItem( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
983 | self, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
984 | author, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
985 | date, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
986 | message, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
987 | revision, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
988 | changedPaths, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
989 | parents, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
990 | branches, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
991 | tags, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
992 | phase, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
993 | bookmarks, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
994 | latestTag, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
995 | canPush=False, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
996 | ): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
997 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
998 | Private method to generate a log tree entry. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
999 | |
7971
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1000 | @param author author info |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1001 | @type str |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1002 | @param date date info |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1003 | @type str |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1004 | @param message text of the log message |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1005 | @type list of str |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1006 | @param revision revision info |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1007 | @type str |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1008 | @param changedPaths list of dictionary objects containing |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1009 | info about the changed files/directories |
7971
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1010 | @type dict |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1011 | @param parents list of parent revisions |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1012 | @type list of int |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1013 | @param branches list of branches |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1014 | @type list of str |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1015 | @param tags list of tags |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1016 | @type str |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1017 | @param phase phase of the entry |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1018 | @type str |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1019 | @param bookmarks list of bookmarks |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1020 | @type str |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1021 | @param latestTag the latest tag(s) reachable from the changeset |
7971
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1022 | @type list of str |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1023 | @param canPush flag indicating that changesets can be pushed |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1024 | @type bool |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1025 | @return reference to the generated item |
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1026 | @rtype QTreeWidgetItem |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1027 | """ |
5451
8ee36e8a315f
Added the capability to configure the length of the log message shown in the message column of the Mercurial log browser list.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5450
diff
changeset
|
1028 | logMessageColumnWidth = self.vcs.getPlugin().getPreferences( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1029 | "LogMessageColumnWidth" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1030 | ) |
5451
8ee36e8a315f
Added the capability to configure the length of the log message shown in the message column of the Mercurial log browser list.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5450
diff
changeset
|
1031 | msgtxt = "" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1032 | for line in message: |
5451
8ee36e8a315f
Added the capability to configure the length of the log message shown in the message column of the Mercurial log browser list.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5450
diff
changeset
|
1033 | if ". " in line: |
8ee36e8a315f
Added the capability to configure the length of the log message shown in the message column of the Mercurial log browser list.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5450
diff
changeset
|
1034 | msgtxt += " " + line.strip().split(". ", 1)[0] + "." |
8ee36e8a315f
Added the capability to configure the length of the log message shown in the message column of the Mercurial log browser list.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5450
diff
changeset
|
1035 | break |
8ee36e8a315f
Added the capability to configure the length of the log message shown in the message column of the Mercurial log browser list.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5450
diff
changeset
|
1036 | else: |
8ee36e8a315f
Added the capability to configure the length of the log message shown in the message column of the Mercurial log browser list.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5450
diff
changeset
|
1037 | msgtxt += " " + line.strip() |
8ee36e8a315f
Added the capability to configure the length of the log message shown in the message column of the Mercurial log browser list.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5450
diff
changeset
|
1038 | if len(msgtxt) > logMessageColumnWidth: |
8ee36e8a315f
Added the capability to configure the length of the log message shown in the message column of the Mercurial log browser list.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5450
diff
changeset
|
1039 | msgtxt = "{0}...".format(msgtxt[:logMessageColumnWidth]) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1040 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1041 | rev, node = revision.split(":") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1042 | closedStr = self.ClosedIndicator if rev in self.__closedBranchesRevs else "" |
8234
fcb6b4b96274
Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator) (batch 2).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8222
diff
changeset
|
1043 | phaseStr = self.phases.get(phase, phase) |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1044 | columnLabels = [ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1045 | "", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1046 | branches[0] + closedStr, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1047 | "{0:>7}:{1}".format(rev, node), |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
1048 | phaseStr, |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1049 | author, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1050 | date, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1051 | msgtxt, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1052 | ", ".join(tags), |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1053 | ] |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1054 | if bookmarks is not None: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1055 | columnLabels.append(", ".join(bookmarks)) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1056 | itm = QTreeWidgetItem(self.logTree, columnLabels) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1057 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1058 | itm.setForeground( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1059 | self.BranchColumn, QBrush(QColor(self.__branchColor(branches[0]))) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1060 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1061 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1062 | if not self.projectMode: |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1063 | parents = self.__getParents(rev) |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1064 | if not parents: |
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1065 | parents = [int(rev) - 1] |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1066 | column, color, edges = self.__generateEdges(int(rev), parents) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1067 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1068 | itm.setData(0, self.__messageRole, message) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1069 | itm.setData(0, self.__changesRole, changedPaths) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
1070 | itm.setData(0, self.__edgesRole, edges) |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1071 | itm.setData(0, self.__latestTagRole, latestTag) |
3242
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1072 | if parents == [-1]: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1073 | itm.setData(0, self.__parentsRole, []) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1074 | else: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1075 | itm.setData(0, self.__parentsRole, parents) |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
1076 | for parent in parents: |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
1077 | self.__childrenInfo[parent].append(int(rev)) |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1078 | itm.setData(0, self.__incomingRole, self.commandMode == "incoming") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1079 | |
8259
2bbec88047dd
Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8243
diff
changeset
|
1080 | topedges = ( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1081 | self.logTree.topLevelItem(self.logTree.indexOfTopLevelItem(itm) - 1).data( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1082 | 0, self.__edgesRole |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1083 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1084 | if self.logTree.topLevelItemCount() > 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1085 | else None |
8259
2bbec88047dd
Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8243
diff
changeset
|
1086 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1087 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1088 | icon = self.__generateIcon( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1089 | column, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1090 | edges, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1091 | topedges, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1092 | QColor(self.__branchColor(branches[0])), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1093 | rev in self.__projectWorkingDirParents, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1094 | rev in self.__closedBranchesRevs, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1095 | phase == "draft" and canPush, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1096 | ) |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1097 | itm.setIcon(0, icon) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1098 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1099 | try: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1100 | self.__lastRev = int(revision.split(":")[0]) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1101 | except ValueError: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1102 | self.__lastRev = 0 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1103 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1104 | return itm |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1105 | |
5444
4799e2cf8401
Corrected the Mercurial log browser window refresh action to load as much entries as are already shown (i.e. do not start from scratch).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1106 | def __getLogEntries(self, startRev=None, noEntries=0): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1107 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1108 | Private method to retrieve log entries from the repository. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1109 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1110 | @param startRev revision number to start from |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1111 | @type int or str |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1112 | @param noEntries number of entries to get (0 = default) |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1113 | @type int |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1114 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1115 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1116 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1117 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1118 | QApplication.processEvents() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1119 | |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
1120 | with EricOverrideCursor(): |
11039
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1121 | self.errorGroup.hide() |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1122 | self.errors.clear() |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1123 | |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1124 | self.buf = [] |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1125 | self.cancelled = False |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1126 | self.intercept = False |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1127 | |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1128 | if noEntries == 0: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1129 | noEntries = self.limitSpinBox.value() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1130 | |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1131 | preargs = [] |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1132 | args = self.vcs.initCommand(self.commandMode) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1133 | args.append("--verbose") |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1134 | if self.commandMode not in ("incoming", "outgoing"): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1135 | args.append("--limit") |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1136 | args.append(str(noEntries)) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1137 | if self.commandMode in ("incoming", "outgoing"): |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1138 | args.append("--newest-first") |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1139 | if self.vcs.hasSubrepositories(): |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1140 | args.append("--subrepos") |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1141 | if startRev is not None: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1142 | args.append("--rev") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1143 | args.append("{0}:0".format(startRev)) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1144 | if not self.projectMode and not self.stopCheckBox.isChecked(): |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1145 | args.append("--follow") |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1146 | if self.commandMode == "log": |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1147 | args.append("--copies") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1148 | args.append("--template") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1149 | args.append( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1150 | os.path.join( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1151 | os.path.dirname(__file__), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1152 | "templates", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1153 | "logBrowserBookmarkPhase.tmpl", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1154 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1155 | ) |
10215
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
1156 | for branch in self.__branchesFilterList: |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
1157 | args.extend(["--branch", branch]) |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1158 | if self.commandMode == "incoming": |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1159 | if self.__bundle: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1160 | args.append(self.__bundle) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1161 | elif not self.vcs.hasSubrepositories(): |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
1162 | project = ericApp().getObject("Project") |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1163 | self.vcs.bundleFile = os.path.join( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1164 | project.getProjectManagementDir(), "hg-bundle.hg" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1165 | ) |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1166 | if os.path.exists(self.vcs.bundleFile): |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1167 | os.remove(self.vcs.bundleFile) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1168 | preargs = args[:] |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1169 | preargs.append("--quiet") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1170 | preargs.append("--bundle") |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1171 | preargs.append(self.vcs.bundleFile) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1172 | args.append(self.vcs.bundleFile) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1173 | if not self.projectMode: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1174 | args.append(self.__filename) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1175 | |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1176 | if preargs: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1177 | out, err = self.__hgClient.runcommand(preargs) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1178 | else: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1179 | err = "" |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1180 | if err: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1181 | if ( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1182 | self.commandMode == "incoming" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1183 | and self.initialCommandMode == "full_log" |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1184 | ): |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1185 | # ignore the error |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1186 | self.commandMode = "log" |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1187 | else: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1188 | self.__showError(err) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1189 | elif ( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1190 | self.commandMode != "incoming" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1191 | or (self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile)) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1192 | or self.__bundle |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1193 | ): |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1194 | out, err = self.__hgClient.runcommand(args) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1195 | self.buf = out.splitlines(True) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1196 | if err: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1197 | self.__showError(err) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1198 | self.__processBuffer() |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1199 | elif ( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1200 | self.commandMode == "incoming" and self.initialCommandMode == "full_log" |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1201 | ): |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7679
diff
changeset
|
1202 | # no incoming changesets, just switch to log mode |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1203 | self.commandMode = "log" |
7370
5fb53279f2df
Mercurial: removed some old code dealing with using the hg commandline executable instead of the command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1204 | self.__finish() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1205 | |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1206 | def start(self, name=None, bundle=None, isFile=False, noEntries=0): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1207 | """ |
198
7ab8e126f404
Fixed a few issues with the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1208 | Public slot to start the hg log command. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1209 | |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1210 | @param name file/directory name to show the log for |
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1211 | @type str |
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1212 | @param bundle name of a bundle file |
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1213 | @type str |
7900
72b88fb20261
Corrected the use of '@keyparam' in the source documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7836
diff
changeset
|
1214 | @param isFile flag indicating log for a file is to be shown |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1215 | @type bool |
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1216 | @param noEntries number of entries to get (0 = default) |
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1217 | @type int |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1218 | """ |
3287
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
1219 | self.__bundle = bundle |
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
1220 | self.__isFile = isFile |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1221 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1222 | if self.initialCommandMode == "full_log": |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1223 | if isFile: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1224 | self.commandMode = "log" |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1225 | self.__finishCallbacks = [] |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1226 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1227 | self.commandMode = "incoming" |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1228 | self.__addFinishCallback(self.on_nextButton_clicked) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1229 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1230 | self.sbsSelectLabel.clear() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1231 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1232 | self.errorGroup.hide() |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1233 | self.errors.clear() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1234 | QApplication.processEvents() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1235 | |
3283
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
1236 | self.__initData() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1237 | |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1238 | self.__filename = name |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1239 | |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1240 | self.projectMode = name is None |
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1241 | self.stopCheckBox.setDisabled(self.projectMode) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1242 | self.activateWindow() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1243 | self.raise_() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1244 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1245 | self.logTree.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1246 | self.__started = True |
243
a1d982e68edf
Fixed an issue introduced by the latest change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
241
diff
changeset
|
1247 | self.__identifyProject() |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
1248 | self.__getClosedBranches() |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
1249 | self.__getHeads() |
5444
4799e2cf8401
Corrected the Mercurial log browser window refresh action to load as much entries as are already shown (i.e. do not start from scratch).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1250 | self.__getLogEntries(noEntries=noEntries) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1251 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1252 | def __finish(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1253 | """ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1254 | Private slot called when the process finished or the user pressed |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1255 | the button. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1256 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1257 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1258 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1259 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1260 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1261 | self.refreshButton.setEnabled(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1262 | |
5450
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
1263 | while self.__finishCallbacks: |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
1264 | self.__finishCallbacks.pop(0)() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1265 | |
3317
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1266 | def __modifyForLargeFiles(self, filename): |
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1267 | """ |
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1268 | Private method to convert the displayed file name for a large file. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1269 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1270 | @param filename file name to be processed |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1271 | @type str |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1272 | @return processed file name |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1273 | @rtype str |
3317
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1274 | """ |
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1275 | if filename.startswith((self.LargefilesCacheL, self.LargefilesCacheW)): |
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1276 | return self.tr("{0} (large file)").format( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1277 | self.PathSeparatorRe.split(filename, 1)[1] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1278 | ) |
3317
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1279 | else: |
d7639a86e90f
Added support for Mercurial outgoing with largefiles by looking for a .hglf path prefix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1280 | return filename |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1281 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1282 | def __processBuffer(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1283 | """ |
198
7ab8e126f404
Fixed a few issues with the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1284 | Private method to process the buffered output of the hg log command. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1285 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1286 | noEntries = 0 |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
1287 | log = {"message": [], "bookmarks": None, "phase": ""} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1288 | changedPaths = [] |
181
4af57f97c1bc
Added code to choose the way incoming and outgoing logs are shown.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1289 | initialText = True |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1290 | fileCopies = {} |
7971
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1291 | canPush = self.vcs.canPush() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1292 | for s in self.buf: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1293 | if s != "@@@\n": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1294 | try: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1295 | key, value = s.split("|", 1) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1296 | except ValueError: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1297 | key = "" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1298 | value = s |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1299 | if key == "change": |
181
4af57f97c1bc
Added code to choose the way incoming and outgoing logs are shown.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1300 | initialText = False |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1301 | log["revision"] = value.strip() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1302 | elif key == "user": |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1303 | log["author"] = value.strip() |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1304 | elif key == "parents": |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1305 | log["parents"] = [ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1306 | int(x.split(":", 1)[0]) for x in value.strip().split() |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1307 | ] |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1308 | elif key == "date": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1309 | log["date"] = " ".join(value.strip().split()[:2]) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1310 | elif key == "description": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1311 | log["message"].append(value.strip()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1312 | elif key == "file_adds": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1313 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1314 | for f in value.strip().split(", "): |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1315 | if f in fileCopies: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1316 | changedPaths.append( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1317 | { |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1318 | "action": "A", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1319 | "path": self.__modifyForLargeFiles(f), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1320 | "copyfrom": self.__modifyForLargeFiles( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1321 | fileCopies[f] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1322 | ), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1323 | } |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1324 | ) |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1325 | else: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1326 | changedPaths.append( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1327 | { |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1328 | "action": "A", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1329 | "path": self.__modifyForLargeFiles(f), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1330 | "copyfrom": "", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1331 | } |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1332 | ) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1333 | elif key == "files_mods": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1334 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1335 | for f in value.strip().split(", "): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1336 | changedPaths.append( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1337 | { |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1338 | "action": "M", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1339 | "path": self.__modifyForLargeFiles(f), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1340 | "copyfrom": "", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1341 | } |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1342 | ) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1343 | elif key == "file_dels": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1344 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1345 | for f in value.strip().split(", "): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1346 | changedPaths.append( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1347 | { |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1348 | "action": "D", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1349 | "path": self.__modifyForLargeFiles(f), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1350 | "copyfrom": "", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1351 | } |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1352 | ) |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1353 | elif key == "file_copies": |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1354 | if value.strip(): |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1355 | for entry in value.strip().split(", "): |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1356 | newName, oldName = entry[:-1].split(" (") |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1357 | fileCopies[newName] = oldName |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1358 | elif key == "branches": |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1359 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1360 | log["branches"] = value.strip().split(", ") |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1361 | else: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1362 | log["branches"] = ["default"] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1363 | elif key == "tags": |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1364 | log["tags"] = value.strip().split(", ") |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1365 | elif key == "bookmarks": |
1019
d8a9697f78d1
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
1366 | log["bookmarks"] = value.strip().split(", ") |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
1367 | elif key == "phase": |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
1368 | log["phase"] = value.strip() |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1369 | elif key == "latesttag": |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1370 | tag = value.strip() |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1371 | if tag == "null": |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1372 | log["latesttag"] = [] |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1373 | elif ":" in tag: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1374 | log["latesttag"] = [ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1375 | t.strip() for t in tag.split(":") if t.strip() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1376 | ] |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1377 | else: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1378 | log["latesttag"] = [tag] |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1379 | else: |
181
4af57f97c1bc
Added code to choose the way incoming and outgoing logs are shown.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1380 | if initialText: |
4af57f97c1bc
Added code to choose the way incoming and outgoing logs are shown.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1381 | continue |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1382 | if value.strip(): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1383 | log["message"].append(value.strip()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1384 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1385 | if len(log) > 1: |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
1386 | self.__generateLogItem( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1387 | log["author"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1388 | log["date"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1389 | log["message"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1390 | log["revision"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1391 | changedPaths, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1392 | log["parents"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1393 | log["branches"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1394 | log["tags"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1395 | log["phase"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1396 | log["bookmarks"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1397 | log["latesttag"], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1398 | canPush=canPush, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1399 | ) |
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:
7971
diff
changeset
|
1400 | dt = QDate.fromString(log["date"], Qt.DateFormat.ISODate) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1401 | if not self.__maxDate.isValid() and not self.__minDate.isValid(): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1402 | self.__maxDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1403 | self.__minDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1404 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1405 | if self.__maxDate < dt: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1406 | self.__maxDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1407 | if self.__minDate > dt: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1408 | self.__minDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1409 | noEntries += 1 |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
1410 | log = {"message": [], "bookmarks": None, "phase": ""} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1411 | changedPaths = [] |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1412 | fileCopies = {} |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1413 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1414 | self.__resizeColumnsLog() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1415 | |
8222
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1416 | if self.__started and not self.__finishCallbacks: |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1417 | # we are really done |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1418 | if self.__selectedRevisions: |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1419 | foundItems = self.logTree.findItems( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1420 | self.__selectedRevisions[0], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1421 | Qt.MatchFlag.MatchExactly, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1422 | self.RevisionColumn, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1423 | ) |
8222
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1424 | if foundItems: |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1425 | self.logTree.setCurrentItem(foundItems[0]) |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1426 | else: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1427 | self.logTree.setCurrentItem(self.logTree.topLevelItem(0)) |
8222
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1428 | elif self.__projectWorkingDirParents: |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1429 | for rev in self.__projectWorkingDirParents: |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1430 | # rev string format must match with the format of the |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1431 | # __generateLogItem() method |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1432 | items = self.logTree.findItems( |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1433 | "{0:>7}:".format(rev), |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1434 | Qt.MatchFlag.MatchStartsWith, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1435 | self.RevisionColumn, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1436 | ) |
8222
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1437 | if items: |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1438 | self.logTree.setCurrentItem(items[0]) |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1439 | break |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1440 | else: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1441 | self.logTree.setCurrentItem(self.logTree.topLevelItem(0)) |
8222
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1442 | else: |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1443 | self.logTree.setCurrentItem(self.logTree.topLevelItem(0)) |
5994b80b8760
Applied some more code simplifications suggested by the new Simplify checker (Y102: use single if) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
1444 | self.__started = False |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1445 | |
781
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1446 | if self.commandMode in ("incoming", "outgoing"): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1447 | self.commandMode = "log" # switch to log mode |
781
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1448 | if self.__lastRev > 0: |
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1449 | self.nextButton.setEnabled(True) |
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1450 | self.limitSpinBox.setEnabled(True) |
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1451 | else: |
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1452 | if noEntries < self.limitSpinBox.value() and not self.cancelled: |
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1453 | self.nextButton.setEnabled(False) |
2f85b5573e62
Changed the Mercurial log browser to show incoming/outgoing changesets with the current log (by pressing the next button).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1454 | self.limitSpinBox.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1455 | |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1456 | # update the log filters |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1457 | self.__filterLogsEnabled = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1458 | self.fromDate.setMinimumDate(self.__minDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1459 | self.fromDate.setMaximumDate(self.__maxDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1460 | self.fromDate.setDate(self.__minDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1461 | self.toDate.setMinimumDate(self.__minDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1462 | self.toDate.setMaximumDate(self.__maxDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1463 | self.toDate.setDate(self.__maxDate) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1464 | |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1465 | branchFilter = self.branchCombo.currentText() |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1466 | if not branchFilter: |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1467 | branchFilter = self.__allBranchesFilter |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1468 | self.branchCombo.clear() |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1469 | self.branchCombo.addItems( |
10373
093dcebe5ecb
Corrected some uses of dict.keys(), dict.values() and dict.items().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10372
diff
changeset
|
1470 | [self.__allBranchesFilter] + sorted(self.__branchColors) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1471 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1472 | self.branchCombo.setCurrentIndex(self.branchCombo.findText(branchFilter)) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1473 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1474 | self.__filterLogsEnabled = True |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1475 | if self.__actionMode() == "filter": |
4080
d4ba5fab5557
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4060
diff
changeset
|
1476 | self.__filterLogs() |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
1477 | self.__updateToolMenuActions() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1478 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1479 | # restore selected item |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1480 | if self.__selectedRevisions and not self.__finishCallbacks: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1481 | # we are really done |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1482 | for revision in self.__selectedRevisions: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1483 | items = self.logTree.findItems( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1484 | revision, Qt.MatchFlag.MatchExactly, self.RevisionColumn |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1485 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1486 | if items: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1487 | items[0].setSelected(True) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1488 | self.__selectedRevisions = [] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1489 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1490 | def __showError(self, out): |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1491 | """ |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1492 | Private slot to show some error. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1493 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1494 | @param out error to be shown |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1495 | @type str |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1496 | """ |
11039
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1497 | errLines = [ |
11066
d71eab9be477
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11039
diff
changeset
|
1498 | line |
d71eab9be477
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11039
diff
changeset
|
1499 | for line in out.splitlines(keepends=True) |
d71eab9be477
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11039
diff
changeset
|
1500 | if "no such file in rev" not in line |
11039
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1501 | ] |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1502 | if errLines: |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1503 | self.errorGroup.show() |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1504 | self.errors.insertPlainText("".join(errLines)) |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1505 | self.errors.ensureCursorVisible() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1506 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1507 | def on_buttonBox_clicked(self, button): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1508 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1509 | Private slot called by a button of the button box clicked. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1510 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1511 | @param button button that was clicked |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1512 | @type QAbstractButton |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1513 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1514 | if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1515 | self.close() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1516 | elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1517 | self.cancelled = True |
7370
5fb53279f2df
Mercurial: removed some old code dealing with using the hg commandline executable instead of the command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1518 | self.__hgClient.cancel() |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1519 | elif button == self.refreshButton: |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1520 | self.on_refreshButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1521 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1522 | def __updateSbsSelectLabel(self): |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1523 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1524 | Private slot to update the enabled status of the diff buttons. |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1525 | """ |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1526 | self.sbsSelectLabel.clear() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1527 | if self.__isFile: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1528 | selectedItems = self.logTree.selectedItems() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1529 | if len(selectedItems) == 1: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1530 | currentItem = selectedItems[0] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1531 | rev2 = currentItem.text(self.RevisionColumn).split(":", 1)[0].strip() |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1532 | parents = currentItem.data(0, self.__parentsRole) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1533 | if parents: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1534 | parentLinks = [] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1535 | for index in range(len(parents)): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1536 | parentLinks.append( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1537 | '<a href="sbsdiff:{0}_{1}"> {2} </a>'.format( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1538 | parents[index], rev2, index + 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1539 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1540 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1541 | self.sbsSelectLabel.setText( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1542 | self.tr("Side-by-Side Diff to Parent {0}").format( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1543 | " ".join(parentLinks) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1544 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1545 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1546 | elif len(selectedItems) == 2: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1547 | rev1 = int(selectedItems[0].text(self.RevisionColumn).split(":", 1)[0]) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1548 | rev2 = int(selectedItems[1].text(self.RevisionColumn).split(":", 1)[0]) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1549 | if rev1 > rev2: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1550 | # Swap the entries, so that rev1 < rev2 |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1551 | rev1, rev2 = rev2, rev1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1552 | self.sbsSelectLabel.setText( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1553 | self.tr( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1554 | '<a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a>' |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1555 | ).format(rev1, rev2) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1556 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1557 | |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
1558 | def __updateToolMenuActions(self): |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
1559 | """ |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
1560 | Private slot to update the status of the tool menu actions and |
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
1561 | the tool menu button. |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
1562 | """ |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1563 | if self.initialCommandMode in ("log", "full_log") and self.projectMode: |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1564 | # do the phase action |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1565 | # step 1: count entries with changeable phases |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1566 | secret = 0 |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1567 | draft = 0 |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1568 | public = 0 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1569 | for itm in [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1570 | item |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1571 | for item in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1572 | if not item.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1573 | ]: |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1574 | # count phase for local items only |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1575 | phase = itm.text(self.PhaseColumn) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1576 | if phase == self.phases["draft"]: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1577 | draft += 1 |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1578 | elif phase == self.phases["secret"]: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1579 | secret += 1 |
2569
0fff8dc5d472
Fixed an issue in the Mercurial log browser setting the correct state of the phase button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2567
diff
changeset
|
1580 | else: |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1581 | public += 1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1582 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1583 | # step 2: set the status of the phase action |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1584 | if public == 0 and ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1585 | (secret > 0 and draft == 0) or (secret == 0 and draft > 0) |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1586 | ): |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1587 | self.__phaseAct.setEnabled(True) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1588 | else: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1589 | self.__phaseAct.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1590 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1591 | # do the graft action |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1592 | # step 1: count selected entries not belonging to the |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1593 | # current branch |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1594 | otherBranches = 0 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1595 | for itm in [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1596 | item |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1597 | for item in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1598 | if not item.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1599 | ]: |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1600 | # for local items only |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1601 | branch = itm.text(self.BranchColumn) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1602 | if branch != self.__projectBranch: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1603 | otherBranches += 1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1604 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1605 | # step 2: set the status of the graft action |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1606 | self.__graftAct.setEnabled(otherBranches > 0) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1607 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1608 | selectedItemsCount = len( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1609 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1610 | itm |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1611 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1612 | if not itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1613 | ] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1614 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1615 | selectedIncomingItemsCount = len( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1616 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1617 | itm |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1618 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1619 | if itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1620 | ] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1621 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1622 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1623 | self.__mergeAct.setEnabled(selectedItemsCount == 1) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1624 | self.__tagAct.setEnabled(selectedItemsCount == 1) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1625 | self.__switchAct.setEnabled(selectedItemsCount == 1) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1626 | self.__bookmarkAct.setEnabled(selectedItemsCount == 1) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1627 | self.__bookmarkMoveAct.setEnabled(selectedItemsCount == 1) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1628 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1629 | if self.vcs.canPull(): |
11109
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
1630 | self.__pullAct.setEnabled(selectedIncomingItemsCount > 0) |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
1631 | self.__pullAllAct.setEnabled(True) |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1632 | self.__lfPullAct.setEnabled( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1633 | self.vcs.isExtensionActive("largefiles") and selectedItemsCount > 0 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1634 | ) |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1635 | else: |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1636 | self.__pullAct.setEnabled(False) |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1637 | self.__lfPullAct.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1638 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1639 | if self.vcs.canPush(): |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1640 | self.__pushAct.setEnabled( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1641 | selectedItemsCount == 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1642 | and not self.logTree.selectedItems()[0].data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1643 | and self.logTree.selectedItems()[0].text(self.PhaseColumn) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1644 | == self.phases["draft"] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1645 | ) |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1646 | self.__pushAllAct.setEnabled(True) |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1647 | else: |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1648 | self.__pushAct.setEnabled(False) |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1649 | self.__pushAllAct.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1650 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1651 | self.__stripAct.setEnabled( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1652 | self.vcs.isExtensionActive("strip") and selectedItemsCount == 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1653 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1654 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1655 | # count incoming items for 'full_log' |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1656 | if self.initialCommandMode == "full_log": |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1657 | # incoming items are at the top |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1658 | incomingCount = 0 |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1659 | for row in range(self.logTree.topLevelItemCount()): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1660 | if self.logTree.topLevelItem(row).data(0, self.__incomingRole): |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1661 | incomingCount += 1 |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1662 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1663 | break |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1664 | localCount = self.logTree.topLevelItemCount() - incomingCount |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1665 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1666 | localCount = self.logTree.topLevelItemCount() |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1667 | self.__bundleAct.setEnabled(localCount > 0) |
5514
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
1668 | self.__unbundleAct.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1669 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1670 | self.__gpgSignAct.setEnabled( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1671 | self.vcs.isExtensionActive("gpg") and selectedItemsCount > 0 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1672 | ) |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1673 | self.__gpgVerifyAct.setEnabled( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1674 | self.vcs.isExtensionActive("gpg") and selectedItemsCount == 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1675 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1676 | |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
1677 | if self.vcs.isExtensionActive("closehead"): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1678 | revs = [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1679 | itm.text(self.RevisionColumn).strip().split(":", 1)[0] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1680 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1681 | if not itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1682 | ] |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
1683 | revs = [rev for rev in revs if rev in self.__headRevisions] |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
1684 | self.__closeHeadsAct.setEnabled(len(revs) > 0) |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
1685 | else: |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
1686 | self.__closeHeadsAct.setEnabled(False) |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
1687 | self.actionsButton.setEnabled(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1688 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1689 | elif self.initialCommandMode == "incoming" and self.projectMode: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1690 | for act in [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1691 | self.__phaseAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1692 | self.__graftAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1693 | self.__mergeAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1694 | self.__tagAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1695 | self.__closeHeadsAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1696 | self.__switchAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1697 | self.__bookmarkAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1698 | self.__bookmarkMoveAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1699 | self.__pushAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1700 | self.__pushAllAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1701 | self.__stripAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1702 | self.__bundleAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1703 | self.__gpgSignAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1704 | self.__gpgVerifyAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1705 | ]: |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1706 | act.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1707 | |
5930
9fe93d87d502
Fixed an issue in the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5880
diff
changeset
|
1708 | if self.vcs.canPull() and not bool(self.__bundle): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1709 | selectedIncomingItemsCount = len( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1710 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1711 | itm |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1712 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1713 | if itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1714 | ] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1715 | ) |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1716 | self.__pullAct.setEnabled(selectedIncomingItemsCount > 0) |
11109
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
1717 | self.__pullAllAct.setEnabled(True) |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1718 | self.__lfPullAct.setEnabled( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1719 | self.vcs.isExtensionActive("largefiles") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1720 | and selectedIncomingItemsCount > 0 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1721 | ) |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1722 | else: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1723 | self.__pullAct.setEnabled(False) |
11109
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
1724 | self.__pullAllAct.setEnabled(False) |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1725 | self.__lfPullAct.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1726 | |
5514
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
1727 | self.__unbundleAct.setEnabled(bool(self.__bundle)) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1728 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1729 | self.actionsButton.setEnabled(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1730 | |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1731 | elif self.initialCommandMode == "outgoing" and self.projectMode: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1732 | for act in [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1733 | self.__phaseAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1734 | self.__graftAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1735 | self.__mergeAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1736 | self.__tagAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1737 | self.__closeHeadsAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1738 | self.__switchAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1739 | self.__bookmarkAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1740 | self.__bookmarkMoveAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1741 | self.__pullAct, |
11109
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
1742 | self.__pullAllAct, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1743 | self.__lfPullAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1744 | self.__stripAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1745 | self.__gpgSignAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1746 | self.__gpgVerifyAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1747 | self.__unbundleAct, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1748 | ]: |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1749 | act.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1750 | |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1751 | selectedItemsCount = len(self.logTree.selectedItems()) |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1752 | if self.vcs.canPush(): |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1753 | self.__pushAct.setEnabled( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1754 | selectedItemsCount == 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1755 | and self.logTree.selectedItems()[0].text(self.PhaseColumn) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1756 | == self.phases["draft"] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1757 | ) |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1758 | self.__pushAllAct.setEnabled(True) |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1759 | else: |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1760 | self.__pushAct.setEnabled(False) |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1761 | self.__pushAllAct.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1762 | |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1763 | self.__bundleAct.setEnabled(selectedItemsCount > 0) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1764 | |
3243
bbaa32bb9e63
Fixed an issue in the Mercurial log browser dialog that caused the tag action being activated in wrong dialog modes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3242
diff
changeset
|
1765 | else: |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
1766 | self.actionsButton.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1767 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1768 | def __updateDetailsAndFiles(self): |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
1769 | """ |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1770 | Private slot to update the details and file changes panes. |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
1771 | """ |
3536
c06338ca892b
Enhanced the Mercurial log browser dialog to show a summary of the data of the selected changeset in a text edit pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3534
diff
changeset
|
1772 | self.detailsEdit.clear() |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
1773 | self.filesTree.clear() |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1774 | self.__diffUpdatesFiles = False |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1775 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1776 | selectedItems = self.logTree.selectedItems() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1777 | if len(selectedItems) == 1: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1778 | self.detailsEdit.setHtml(self.__generateDetailsTableText(selectedItems[0])) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1779 | self.__updateFilesTree(self.filesTree, selectedItems[0]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1780 | self.__resizeColumnsFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1781 | self.__resortFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1782 | elif len(selectedItems) == 2: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1783 | self.__diffUpdatesFiles = True |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1784 | index1 = self.logTree.indexOfTopLevelItem(selectedItems[0]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1785 | index2 = self.logTree.indexOfTopLevelItem(selectedItems[1]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1786 | if index1 > index2: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1787 | # Swap the entries |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1788 | selectedItems[0], selectedItems[1] = ( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1789 | selectedItems[1], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1790 | selectedItems[0], |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1791 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1792 | html = "{0}<hr/>{1}".format( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1793 | self.__generateDetailsTableText(selectedItems[0]), |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1794 | self.__generateDetailsTableText(selectedItems[1]), |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1795 | ) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1796 | self.detailsEdit.setHtml(html) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1797 | # self.filesTree is updated by the diff |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1798 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1799 | def __generateDetailsTableText(self, itm): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1800 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1801 | Private method to generate an HTML table with the details of the given |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1802 | changeset. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1803 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1804 | @param itm reference to the item the table should be based on |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1805 | @type QTreeWidgetItem |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1806 | @return HTML table containing details |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1807 | @rtype str |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1808 | """ |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
1809 | if itm is not None: |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1810 | if itm.text(self.TagsColumn): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1811 | tagsStr = self.__tagsTemplate.format(itm.text(self.TagsColumn)) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1812 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1813 | tagsStr = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1814 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1815 | if itm.text(self.BookmarksColumn): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1816 | bookmarksStr = self.__bookmarksTemplate.format( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1817 | itm.text(self.BookmarksColumn) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1818 | ) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1819 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1820 | bookmarksStr = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1821 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1822 | if self.projectMode and itm.data(0, self.__latestTagRole): |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1823 | latestTagLinks = [] |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1824 | for tag in itm.data(0, self.__latestTagRole): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1825 | latestTagLinks.append( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1826 | '<a href="rev:{0}">{1}</a>'.format( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1827 | self.__getRevisionOfTag(tag)[0], tag |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1828 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1829 | ) |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1830 | latestTagStr = self.__latestTagTemplate.format( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1831 | ", ".join(latestTagLinks) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1832 | ) |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1833 | else: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1834 | latestTagStr = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1835 | |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
1836 | rev = int(itm.text(self.RevisionColumn).split(":", 1)[0]) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1837 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1838 | if itm.data(0, self.__parentsRole): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1839 | parentLinks = [] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1840 | for parent in [str(x) for x in itm.data(0, self.__parentsRole)]: |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1841 | parentLinks.append('<a href="rev:{0}">{0}</a>'.format(parent)) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1842 | parentsStr = self.__parentsTemplate.format(", ".join(parentLinks)) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1843 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1844 | parentsStr = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1845 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1846 | if self.__childrenInfo[rev]: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1847 | childLinks = [] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1848 | for child in [str(x) for x in self.__childrenInfo[rev]]: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1849 | childLinks.append('<a href="rev:{0}">{0}</a>'.format(child)) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1850 | childrenStr = self.__childrenTemplate.format(", ".join(childLinks)) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1851 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1852 | childrenStr = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1853 | |
8659
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
1854 | messagesList = [] |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
1855 | for line in itm.data(0, self.__messageRole): |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
1856 | match = HgLogBrowserDialog.GraftedRe.fullmatch(line) |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
1857 | if match: |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
1858 | messagesList.append( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1859 | HgLogBrowserDialog.GraftedTemplate.format(match.group(1)) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1860 | ) |
8659
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
1861 | else: |
10928
46651e194fbe
Refactored some packages, modules and code to allow extracting the 'EricXxx' packages into a library project.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10922
diff
changeset
|
1862 | messagesList.append(EricUtilities.html_encode(line.strip())) |
8659
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
1863 | messageStr = "<br />\n".join(messagesList) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1864 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1865 | html = self.__detailsTemplate.format( |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
1866 | itm.text(self.RevisionColumn), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
1867 | itm.text(self.DateColumn), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3554
diff
changeset
|
1868 | itm.text(self.AuthorColumn), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1869 | itm.text(self.BranchColumn).replace(self.ClosedIndicator, ""), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1870 | parentsStr + childrenStr + tagsStr + latestTagStr + bookmarksStr, |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1871 | messageStr, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1872 | ) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1873 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1874 | html = "" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1875 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1876 | return html |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1877 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1878 | def __updateFilesTree(self, parent, itm): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1879 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1880 | Private method to update the files tree with changes of the given item. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1881 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1882 | @param parent parent for the items to be added |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1883 | @type QTreeWidget or QTreeWidgetItem |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1884 | @param itm reference to the item the update should be based on |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1885 | @type QTreeWidgetItem |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1886 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1887 | if itm is not None: |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
1888 | changes = itm.data(0, self.__changesRole) |
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
1889 | if len(changes) > 0: |
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
1890 | for change in changes: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1891 | QTreeWidgetItem( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1892 | parent, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1893 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1894 | self.flags[change["action"]], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1895 | change["path"].strip(), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1896 | change["copyfrom"].strip(), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1897 | ], |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1898 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1899 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1900 | @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1901 | def on_logTree_currentItemChanged(self, current, previous): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1902 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1903 | Private slot called, when the current item of the log tree changes. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1904 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1905 | @param current reference to the new current item |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1906 | @type QTreeWidgetItem |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1907 | @param previous reference to the old current item |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1908 | @type QTreeWidgetItem |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1909 | """ |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
1910 | self.__updateToolMenuActions() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1911 | |
5448
1a86766ed19a
Change the Mercurial log browser such, that the current log entry is highlighted with a bold font.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5445
diff
changeset
|
1912 | # Highlight the current entry using a bold font |
1a86766ed19a
Change the Mercurial log browser such, that the current log entry is highlighted with a bold font.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5445
diff
changeset
|
1913 | for col in range(self.logTree.columnCount()): |
1a86766ed19a
Change the Mercurial log browser such, that the current log entry is highlighted with a bold font.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5445
diff
changeset
|
1914 | current and current.setFont(col, self.__logTreeBoldFont) |
1a86766ed19a
Change the Mercurial log browser such, that the current log entry is highlighted with a bold font.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5445
diff
changeset
|
1915 | previous and previous.setFont(col, self.__logTreeNormalFont) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1916 | |
5449
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1917 | # set the state of the up and down buttons |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1918 | self.upButton.setEnabled( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1919 | current is not None and self.logTree.indexOfTopLevelItem(current) > 0 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1920 | ) |
5449
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1921 | self.downButton.setEnabled( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1922 | current is not None |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1923 | and int(current.text(self.RevisionColumn).split(":")[0]) > 0 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1924 | and ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1925 | self.logTree.indexOfTopLevelItem(current) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1926 | < self.logTree.topLevelItemCount() - 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1927 | or self.nextButton.isEnabled() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1928 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1929 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1930 | |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1931 | @pyqtSlot() |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1932 | def on_logTree_itemSelectionChanged(self): |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1933 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1934 | Private slot called, when the selection has changed. |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1935 | """ |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1936 | self.__updateDetailsAndFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1937 | self.__updateSbsSelectLabel() |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
1938 | self.__updateToolMenuActions() |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1939 | self.__generateDiffs() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1940 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1941 | @pyqtSlot() |
5449
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1942 | def on_upButton_clicked(self): |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1943 | """ |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1944 | Private slot to move the current item up one entry. |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1945 | """ |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1946 | itm = self.logTree.itemAbove(self.logTree.currentItem()) |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1947 | if itm: |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1948 | self.logTree.setCurrentItem(itm) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1949 | |
5449
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1950 | @pyqtSlot() |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1951 | def on_downButton_clicked(self): |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1952 | """ |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1953 | Private slot to move the current item down one entry. |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1954 | """ |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1955 | itm = self.logTree.itemBelow(self.logTree.currentItem()) |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1956 | if itm: |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1957 | self.logTree.setCurrentItem(itm) |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1958 | else: |
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1959 | # load the next bunch and try again |
5490
95db14ec60b2
Added some code to cope with unlimited recursions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5489
diff
changeset
|
1960 | if self.nextButton.isEnabled(): |
5493
09cd66fa3243
Fixed an issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5490
diff
changeset
|
1961 | self.__addFinishCallback(self.on_downButton_clicked) |
5490
95db14ec60b2
Added some code to cope with unlimited recursions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5489
diff
changeset
|
1962 | self.on_nextButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1963 | |
5449
7679d1d3671a
Added up and down buttons to move the current entry to the Mercurial and Subversion log browsers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5448
diff
changeset
|
1964 | @pyqtSlot() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1965 | def on_nextButton_clicked(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1966 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1967 | Private slot to handle the Next button. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1968 | """ |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1969 | if self.nextButton.isEnabled(): |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1970 | if self.__lastRev > 0: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1971 | self.__getLogEntries(startRev=self.__lastRev - 1) |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1972 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
1973 | self.__getLogEntries() |
11039
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
1974 | self.__generateDiffs() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1975 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1976 | @pyqtSlot(QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1977 | def on_fromDate_dateChanged(self, date): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1978 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1979 | Private slot called, when the from date changes. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1980 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1981 | @param date new date |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1982 | @type QDate |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1983 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1984 | if self.__actionMode() == "filter": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1985 | self.__filterLogs() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1986 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1987 | @pyqtSlot(QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1988 | def on_toDate_dateChanged(self, date): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1989 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1990 | Private slot called, when the from date changes. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1991 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1992 | @param date new date |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
1993 | @type QDate |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1994 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1995 | if self.__actionMode() == "filter": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1996 | self.__filterLogs() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
1997 | |
8151
8c1445825e7b
Changed code to not use QComboBox.activated[str] and QComboBoc.highlighted[str] signals but the int variants instead.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
1998 | @pyqtSlot(int) |
8c1445825e7b
Changed code to not use QComboBox.activated[str] and QComboBoc.highlighted[str] signals but the int variants instead.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
1999 | def on_branchCombo_activated(self, index): |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
2000 | """ |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
2001 | Private slot called, when a new branch is selected. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2002 | |
8151
8c1445825e7b
Changed code to not use QComboBox.activated[str] and QComboBoc.highlighted[str] signals but the int variants instead.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
2003 | @param index index of the selected entry |
8c1445825e7b
Changed code to not use QComboBox.activated[str] and QComboBoc.highlighted[str] signals but the int variants instead.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
2004 | @type int |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
2005 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2006 | if self.__actionMode() == "filter": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2007 | self.__filterLogs() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2008 | |
8151
8c1445825e7b
Changed code to not use QComboBox.activated[str] and QComboBoc.highlighted[str] signals but the int variants instead.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
2009 | @pyqtSlot(int) |
8c1445825e7b
Changed code to not use QComboBox.activated[str] and QComboBoc.highlighted[str] signals but the int variants instead.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
2010 | def on_fieldCombo_activated(self, index): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2011 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2012 | Private slot called, when a new filter field is selected. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2013 | |
8151
8c1445825e7b
Changed code to not use QComboBox.activated[str] and QComboBoc.highlighted[str] signals but the int variants instead.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
2014 | @param index index of the selected entry |
8c1445825e7b
Changed code to not use QComboBox.activated[str] and QComboBoc.highlighted[str] signals but the int variants instead.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
2015 | @type int |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2016 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2017 | if self.__actionMode() == "filter": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2018 | self.__filterLogs() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2019 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2020 | @pyqtSlot(str) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2021 | def on_rxEdit_textChanged(self, txt): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2022 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2023 | Private slot called, when a filter expression is entered. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2024 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2025 | @param txt filter expression |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2026 | @type str |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2027 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2028 | if self.__actionMode() == "filter": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2029 | self.__filterLogs() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2030 | elif self.__actionMode() == "find": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2031 | self.__findItem(self.__findBackwards, interactive=True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2032 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2033 | @pyqtSlot() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2034 | def on_rxEdit_returnPressed(self): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2035 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2036 | Private slot handling a press of the Return key in the rxEdit input. |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2037 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2038 | if self.__actionMode() == "find": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2039 | self.__findItem(self.__findBackwards, interactive=True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2040 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2041 | def __filterLogs(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2042 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2043 | Private method to filter the log entries. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2044 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2045 | if self.__filterLogsEnabled: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2046 | from_ = self.fromDate.date().toString("yyyy-MM-dd") |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2047 | to_ = self.toDate.date().addDays(1).toString("yyyy-MM-dd") |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
2048 | branch = self.branchCombo.currentText() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2049 | closedBranch = branch + "--" |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2050 | fieldIndex, searchRx, indexIsRole = self.__prepareFieldSearch() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2051 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2052 | visibleItemCount = self.logTree.topLevelItemCount() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2053 | currentItem = self.logTree.currentItem() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2054 | for topIndex in range(self.logTree.topLevelItemCount()): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2055 | topItem = self.logTree.topLevelItem(topIndex) |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2056 | if indexIsRole: |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2057 | if fieldIndex == self.__changesRole: |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2058 | changes = topItem.data(0, self.__changesRole) |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2059 | txt = "\n".join( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2060 | [c["path"] for c in changes] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2061 | + [c["copyfrom"] for c in changes] |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2062 | ) |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2063 | else: |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2064 | # Find based on complete message text |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2065 | txt = "\n".join(topItem.data(0, self.__messageRole)) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2066 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2067 | txt = topItem.text(fieldIndex) |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
2068 | if ( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2069 | topItem.text(self.DateColumn) <= to_ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2070 | and topItem.text(self.DateColumn) >= from_ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2071 | and ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2072 | branch == self.__allBranchesFilter |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2073 | or topItem.text(self.BranchColumn) in [branch, closedBranch] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2074 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2075 | and searchRx.search(txt) is not None |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
2076 | ): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2077 | topItem.setHidden(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2078 | if topItem is currentItem: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2079 | self.on_logTree_currentItemChanged(topItem, None) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2080 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2081 | topItem.setHidden(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2082 | if topItem is currentItem: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2083 | self.filesTree.clear() |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2084 | visibleItemCount -= 1 |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2085 | self.logTree.header().setSectionHidden( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2086 | self.IconColumn, visibleItemCount != self.logTree.topLevelItemCount() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2087 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2088 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2089 | def __prepareFieldSearch(self): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2090 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2091 | Private slot to prepare the filed search data. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2092 | |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2093 | @return tuple of field index, search expression and flag indicating |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2094 | that the field index is a data role |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2095 | @rtype tuple of (int, str, bool) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2096 | """ |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2097 | indexIsRole = False |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2098 | txt = self.fieldCombo.itemData(self.fieldCombo.currentIndex()) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2099 | if txt == "author": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2100 | fieldIndex = self.AuthorColumn |
7775
4a1db75550bd
Changed code to not use deprecated 'QRegExp' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7771
diff
changeset
|
2101 | searchRx = re.compile(self.rxEdit.text(), re.IGNORECASE) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2102 | elif txt == "revision": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2103 | fieldIndex = self.RevisionColumn |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2104 | txt = self.rxEdit.text() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2105 | if txt.startswith("^"): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2106 | searchRx = re.compile(r"^\s*{0}".format(txt[1:]), re.IGNORECASE) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2107 | else: |
7775
4a1db75550bd
Changed code to not use deprecated 'QRegExp' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7771
diff
changeset
|
2108 | searchRx = re.compile(txt, re.IGNORECASE) |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2109 | elif txt == "file": |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2110 | fieldIndex = self.__changesRole |
7775
4a1db75550bd
Changed code to not use deprecated 'QRegExp' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7771
diff
changeset
|
2111 | searchRx = re.compile(self.rxEdit.text(), re.IGNORECASE) |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2112 | indexIsRole = True |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2113 | elif txt == "phase": |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2114 | fieldIndex = self.PhaseColumn |
7775
4a1db75550bd
Changed code to not use deprecated 'QRegExp' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7771
diff
changeset
|
2115 | searchRx = re.compile(self.rxEdit.text(), re.IGNORECASE) |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2116 | else: |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2117 | fieldIndex = self.__messageRole |
7775
4a1db75550bd
Changed code to not use deprecated 'QRegExp' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7771
diff
changeset
|
2118 | searchRx = re.compile(self.rxEdit.text(), re.IGNORECASE) |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2119 | indexIsRole = True |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2120 | |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2121 | return fieldIndex, searchRx, indexIsRole |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2122 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2123 | @pyqtSlot(bool) |
10690
fab36645aa7d
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10458
diff
changeset
|
2124 | def on_stopCheckBox_clicked(self, _checked): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2125 | """ |
2962
d6c9d1ca2da4
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
2126 | Private slot called, when the stop on copy/move checkbox is clicked. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2127 | |
10690
fab36645aa7d
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10458
diff
changeset
|
2128 | @param _checked flag indicating the state of the check box (unused) |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2129 | @type bool |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2130 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2131 | self.vcs.getPlugin().setPreferences( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2132 | "StopLogOnCopy", self.stopCheckBox.isChecked() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2133 | ) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2134 | self.nextButton.setEnabled(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2135 | self.limitSpinBox.setEnabled(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2136 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
2137 | @pyqtSlot() |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2138 | def on_refreshButton_clicked(self, addNext=False): |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
2139 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
2140 | Private slot to refresh the log. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2141 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2142 | @param addNext flag indicating to get a second batch of log entries as |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2143 | well |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2144 | @type bool |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
2145 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2146 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2147 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2148 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2149 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
2150 | self.refreshButton.setEnabled(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2151 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2152 | # save the selected items commit IDs |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2153 | self.__selectedRevisions = [] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2154 | for item in self.logTree.selectedItems(): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2155 | self.__selectedRevisions.append(item.text(self.RevisionColumn)) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2156 | |
3287
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
2157 | if self.initialCommandMode in ("incoming", "outgoing"): |
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
2158 | self.nextButton.setEnabled(False) |
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
2159 | self.limitSpinBox.setEnabled(False) |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2160 | if addNext: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2161 | self.__addFinishCallback(self.on_nextButton_clicked) |
3287
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
2162 | else: |
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
2163 | self.nextButton.setEnabled(True) |
c3d784c057b3
Changed the Subversion Log Browser dialogs to maintain its position after being closed and fixed a few issues in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3283
diff
changeset
|
2164 | self.limitSpinBox.setEnabled(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2165 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2166 | if self.initialCommandMode == "full_log": |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2167 | self.commandMode = "incoming" |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2168 | self.__addFinishCallback(self.on_nextButton_clicked) |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2169 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2170 | self.commandMode = self.initialCommandMode |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2171 | self.start( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2172 | self.__filename, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2173 | bundle=self.__bundle, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2174 | isFile=self.__isFile, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2175 | noEntries=self.logTree.topLevelItemCount(), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2176 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2177 | |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
2178 | @pyqtSlot() |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2179 | def __phaseActTriggered(self): |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
2180 | """ |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2181 | Private slot to handle the Change Phase action. |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
2182 | """ |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2183 | itm = self.logTree.selectedItems()[0] |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2184 | if not itm.data(0, self.__incomingRole): |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2185 | currentPhase = itm.text(self.PhaseColumn) |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2186 | revs = [] |
1608
b6390d242303
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1605
diff
changeset
|
2187 | for itm in self.logTree.selectedItems(): |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2188 | if itm.text(self.PhaseColumn) == currentPhase: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2189 | revs.append(itm.text(self.RevisionColumn).split(":")[0].strip()) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2190 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2191 | if not revs: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2192 | self.__phaseAct.setEnabled(False) |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2193 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2194 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2195 | if currentPhase == self.phases["draft"]: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2196 | newPhase = self.phases["secret"] |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2197 | data = (revs, "s", True) |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2198 | else: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2199 | newPhase = self.phases["draft"] |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2200 | data = (revs, "d", False) |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2201 | res = self.vcs.hgPhase(data) |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2202 | if res: |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2203 | for itm in self.logTree.selectedItems(): |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2204 | itm.setText(self.PhaseColumn, newPhase) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2205 | |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2206 | @pyqtSlot() |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2207 | def __graftActTriggered(self): |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2208 | """ |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2209 | Private slot to handle the Copy Changesets action. |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2210 | """ |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2211 | revs = [] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2212 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2213 | for itm in [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2214 | item |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2215 | for item in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2216 | if not item.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2217 | ]: |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2218 | branch = itm.text(self.BranchColumn) |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2219 | if branch != self.__projectBranch: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2220 | revs.append(itm.text(self.RevisionColumn).strip().split(":", 1)[0]) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2221 | |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2222 | if revs: |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2223 | shouldReopen = self.vcs.hgGraft(revs) |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2224 | if shouldReopen: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2225 | res = EricMessageBox.yesNo( |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
2226 | None, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
2227 | self.tr("Copy Changesets"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2228 | self.tr("""The project should be reread. Do this now?"""), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2229 | yesDefault=True, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2230 | ) |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2231 | if res: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2232 | ericApp().getObject("Project").reopenProject() |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2233 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2234 | |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2235 | self.on_refreshButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2236 | |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2237 | @pyqtSlot() |
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2238 | def __tagActTriggered(self): |
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2239 | """ |
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2240 | Private slot to tag the selected revision. |
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2241 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2242 | if ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2243 | len( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2244 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2245 | itm |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2246 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2247 | if not itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2248 | ] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2249 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2250 | == 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2251 | ): |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2252 | itm = self.logTree.selectedItems()[0] |
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2253 | rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0] |
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2254 | tag = itm.text(self.TagsColumn).strip().split(", ", 1)[0] |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2255 | res = self.vcs.vcsTag(revision=rev, tagName=tag) |
3185
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2256 | if res: |
d4fa462547bc
Enhanced the Mercurial tag dialog and extended the Mercurial log browser to allow tagging of a specific revision
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
2257 | self.on_refreshButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2258 | |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2259 | @pyqtSlot() |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2260 | def __closeHeadsActTriggered(self): |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2261 | """ |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2262 | Private slot to close the selected head revisions. |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2263 | """ |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2264 | if self.vcs.isExtensionActive("closehead"): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2265 | revs = [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2266 | itm.text(self.RevisionColumn).strip().split(":", 1)[0] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2267 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2268 | if not itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2269 | ] |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2270 | revs = [rev for rev in revs if rev in self.__headRevisions] |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2271 | if revs: |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2272 | closeheadExtension = self.vcs.getExtensionObject("closehead") |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2273 | if closeheadExtension is not None: |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2274 | closeheadExtension.hgCloseheads(revisions=revs) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2275 | |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2276 | self.on_refreshButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2277 | |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7009
diff
changeset
|
2278 | @pyqtSlot() |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2279 | def __switchActTriggered(self): |
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2280 | """ |
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2281 | Private slot to switch the working directory to the |
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2282 | selected revision. |
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2283 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2284 | if ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2285 | len( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2286 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2287 | itm |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2288 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2289 | if not itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2290 | ] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2291 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2292 | == 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2293 | ): |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2294 | itm = self.logTree.selectedItems()[0] |
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2295 | rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2296 | bookmarks = [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2297 | bm.strip() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2298 | for bm in itm.text(self.BookmarksColumn).strip().split(",") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2299 | if bm.strip() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2300 | ] |
5324
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
2301 | if bookmarks: |
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
2302 | bookmark, ok = QInputDialog.getItem( |
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
2303 | self, |
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
2304 | self.tr("Switch"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2305 | self.tr( |
9576
be9f8e7e42e0
Corrected some 'wrong' string quotes caused by the Black line merging.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2306 | "Select bookmark to switch to (leave empty to use revision):" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2307 | ), |
5324
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
2308 | [""] + bookmarks, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2309 | 0, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2310 | False, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2311 | ) |
5324
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
2312 | if not ok: |
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
2313 | return |
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
2314 | if bookmark: |
337c27027c66
Fixed the handling of the switch action of the Mercurial log browser dialog context menu in the presence of a bookmark.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
2315 | rev = bookmark |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2316 | if rev: |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2317 | shouldReopen = self.vcs.vcsUpdate(revision=rev) |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2318 | if shouldReopen: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2319 | res = EricMessageBox.yesNo( |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2320 | None, |
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2321 | self.tr("Switch"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2322 | self.tr("""The project should be reread. Do this now?"""), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2323 | yesDefault=True, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2324 | ) |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2325 | if res: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2326 | ericApp().getObject("Project").reopenProject() |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2327 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2328 | |
3279
8df9706ef7f4
Extended the Mercurial log browser by an action to switch to the selected revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3273
diff
changeset
|
2329 | self.on_refreshButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2330 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2331 | @pyqtSlot() |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2332 | def __bookmarkActTriggered(self): |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2333 | """ |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2334 | Private slot to bookmark the selected revision. |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2335 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2336 | if ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2337 | len( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2338 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2339 | itm |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2340 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2341 | if not itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2342 | ] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2343 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2344 | == 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2345 | ): |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2346 | itm = self.logTree.selectedItems()[0] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2347 | rev, changeset = itm.text(self.RevisionColumn).strip().split(":", 1) |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2348 | bookmark, ok = QInputDialog.getText( |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2349 | self, |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2350 | self.tr("Define Bookmark"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2351 | self.tr('Enter bookmark name for changeset "{0}":').format(changeset), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2352 | QLineEdit.EchoMode.Normal, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2353 | ) |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2354 | if ok and bool(bookmark): |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2355 | self.vcs.hgBookmarkDefine( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2356 | revision="rev({0})".format(rev), bookmark=bookmark |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2357 | ) |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2358 | self.on_refreshButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2359 | |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2360 | @pyqtSlot() |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2361 | def __bookmarkMoveActTriggered(self): |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2362 | """ |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2363 | Private slot to move a bookmark to the selected revision. |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2364 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2365 | if ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2366 | len( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2367 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2368 | itm |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2369 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2370 | if not itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2371 | ] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2372 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2373 | == 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2374 | ): |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2375 | itm = self.logTree.selectedItems()[0] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2376 | rev, changeset = itm.text(self.RevisionColumn).strip().split(":", 1) |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2377 | bookmarksList = self.vcs.hgGetBookmarksList() |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2378 | bookmark, ok = QInputDialog.getItem( |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2379 | self, |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2380 | self.tr("Move Bookmark"), |
10373
093dcebe5ecb
Corrected some uses of dict.keys(), dict.values() and dict.items().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10372
diff
changeset
|
2381 | self.tr("Select the bookmark to be moved to changeset '{0}':").format( |
093dcebe5ecb
Corrected some uses of dict.keys(), dict.values() and dict.items().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10372
diff
changeset
|
2382 | changeset |
093dcebe5ecb
Corrected some uses of dict.keys(), dict.values() and dict.items().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10372
diff
changeset
|
2383 | ), |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2384 | [""] + bookmarksList, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2385 | 0, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2386 | False, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2387 | ) |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2388 | if ok and bool(bookmark): |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2389 | self.vcs.hgBookmarkMove( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2390 | revision="rev({0})".format(rev), bookmark=bookmark |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2391 | ) |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2392 | self.on_refreshButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2393 | |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2394 | @pyqtSlot() |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2395 | def __lfPullActTriggered(self): |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2396 | """ |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2397 | Private slot to pull large files of selected revisions. |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2398 | """ |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2399 | revs = [] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2400 | for itm in [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2401 | item |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2402 | for item in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2403 | if not item.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2404 | ]: |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2405 | rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0] |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2406 | if rev: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2407 | revs.append(rev) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2408 | |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2409 | if revs: |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2410 | self.vcs.getExtensionObject("largefiles").hgLfPull(revisions=revs) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2411 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2412 | @pyqtSlot() |
11109
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2413 | def __pullActTriggered(self, selectedOnly=False): |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2414 | """ |
11109
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2415 | Private slot to pull all or selected changes from a remote repository. |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2416 | |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2417 | @param selectedOnly flag indicating to pull the selected changes only |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2418 | (defaults to False) |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2419 | @type bool (optional) |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2420 | """ |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2421 | shouldReopen = False |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2422 | refresh = False |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2423 | addNext = False |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2424 | |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2425 | if self.initialCommandMode in ("log", "full_log", "incoming"): |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2426 | revs = [] |
11109
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2427 | if selectedOnly: |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2428 | for itm in [ |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2429 | item |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2430 | for item in self.logTree.selectedItems() |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2431 | if item.data(0, self.__incomingRole) |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2432 | ]: |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2433 | rev = itm.text(self.RevisionColumn).split(":")[1].strip() |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2434 | if rev: |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2435 | revs.append(rev) |
3de1710db709
Modified the Mercurial log browser window slightly to allow pulling all or just selected changes (later without potentially updating the working directory).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
2436 | shouldReopen = self.vcs.hgPull(revisions=revs, noupdate=bool(revs)) |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2437 | refresh = True |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2438 | if self.initialCommandMode == "incoming": |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2439 | addNext = True |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2440 | |
5276
c8055cb37262
Improved the handling of Mercurial log browser actions, that potentially modify the project file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5270
diff
changeset
|
2441 | if shouldReopen: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2442 | res = EricMessageBox.yesNo( |
5276
c8055cb37262
Improved the handling of Mercurial log browser actions, that potentially modify the project file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5270
diff
changeset
|
2443 | None, |
c8055cb37262
Improved the handling of Mercurial log browser actions, that potentially modify the project file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5270
diff
changeset
|
2444 | self.tr("Pull Changes"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2445 | self.tr("""The project should be reread. Do this now?"""), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2446 | yesDefault=True, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2447 | ) |
5276
c8055cb37262
Improved the handling of Mercurial log browser actions, that potentially modify the project file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5270
diff
changeset
|
2448 | if res: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2449 | ericApp().getObject("Project").reopenProject() |
5276
c8055cb37262
Improved the handling of Mercurial log browser actions, that potentially modify the project file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5270
diff
changeset
|
2450 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2451 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2452 | if refresh: |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2453 | self.on_refreshButton_clicked(addNext=addNext) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2454 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2455 | @pyqtSlot() |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2456 | def __pushActTriggered(self): |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2457 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2458 | Private slot to push changes to a remote repository up to a selected |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2459 | changeset. |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2460 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2461 | itm = self.logTree.selectedItems()[0] |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2462 | if not itm.data(0, self.__incomingRole): |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2463 | rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0] |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2464 | if rev: |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2465 | self.vcs.hgPush(rev=rev) |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2466 | self.on_refreshButton_clicked( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2467 | addNext=self.initialCommandMode == "outgoing" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2468 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2469 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2470 | @pyqtSlot() |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2471 | def __pushAllActTriggered(self): |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2472 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2473 | Private slot to push all changes to a remote repository. |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2474 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2475 | self.vcs.hgPush() |
4410
a3a2b652286d
Fixed forgotten refresh for the Mercurial log browser push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4409
diff
changeset
|
2476 | self.on_refreshButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2477 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2478 | @pyqtSlot() |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2479 | def __stripActTriggered(self): |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2480 | """ |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2481 | Private slot to strip changesets from the repository. |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2482 | """ |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2483 | itm = self.logTree.selectedItems()[0] |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2484 | if not itm.data(0, self.__incomingRole): |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2485 | rev = itm.text(self.RevisionColumn).strip().split(":", 1)[1] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2486 | shouldReopen = self.vcs.getExtensionObject("strip").hgStrip(rev=rev) |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2487 | if shouldReopen: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2488 | res = EricMessageBox.yesNo( |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2489 | None, |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2490 | self.tr("Strip Changesets"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2491 | self.tr("""The project should be reread. Do this now?"""), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2492 | yesDefault=True, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2493 | ) |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2494 | if res: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2495 | ericApp().getObject("Project").reopenProject() |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2496 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2497 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2498 | self.on_refreshButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2499 | |
5496
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2500 | @pyqtSlot() |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2501 | def __mergeActTriggered(self): |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2502 | """ |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2503 | Private slot to merge the working directory with the selected |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2504 | changeset. |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2505 | """ |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2506 | itm = self.logTree.selectedItems()[0] |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2507 | if not itm.data(0, self.__incomingRole): |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2508 | rev = "rev({0})".format( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2509 | itm.text(self.RevisionColumn).strip().split(":", 1)[0] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2510 | ) |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2511 | self.vcs.vcsMerge("", rev=rev) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2512 | |
5501
59ed7b2dd952
Started to add a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5496
diff
changeset
|
2513 | @pyqtSlot() |
59ed7b2dd952
Started to add a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5496
diff
changeset
|
2514 | def __bundleActTriggered(self): |
59ed7b2dd952
Started to add a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5496
diff
changeset
|
2515 | """ |
59ed7b2dd952
Started to add a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5496
diff
changeset
|
2516 | Private slot to create a changegroup file. |
59ed7b2dd952
Started to add a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5496
diff
changeset
|
2517 | """ |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2518 | if self.initialCommandMode in ("log", "full_log"): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2519 | selectedItems = [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2520 | itm |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2521 | for itm in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2522 | if not itm.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2523 | ] |
5503
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2524 | if len(selectedItems) == 0: |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2525 | # all revisions of the local repository will be bundled |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2526 | bundleData = { |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2527 | "revs": [], |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2528 | "base": "", |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2529 | "all": True, |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2530 | } |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2531 | elif len(selectedItems) == 1: |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2532 | # the selected changeset is the base |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2533 | rev = ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2534 | selectedItems[0].text(self.RevisionColumn).split(":", 1)[0].strip() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2535 | ) |
5503
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2536 | bundleData = { |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2537 | "revs": [], |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2538 | "base": rev, |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2539 | "all": False, |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2540 | } |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2541 | else: |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2542 | # lowest revision is the base, others will be bundled |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2543 | revs = [] |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2544 | for itm in selectedItems: |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2545 | rev = itm.text(self.RevisionColumn).split(":", 1)[0] |
8240
93b8a353c4bf
Applied some more code simplifications suggested by the new Simplify checker (Y105: use contextlib.suppress) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8234
diff
changeset
|
2546 | with contextlib.suppress(ValueError): |
5503
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2547 | revs.append(int(rev)) |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2548 | baseRev = min(revs) |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2549 | while baseRev in revs: |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2550 | revs.remove(baseRev) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2551 | |
5503
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2552 | bundleData = { |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2553 | "revs": [str(rev) for rev in revs], |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2554 | "base": str(baseRev), |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2555 | "all": False, |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2556 | } |
5501
59ed7b2dd952
Started to add a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5496
diff
changeset
|
2557 | elif self.initialCommandMode == "outgoing": |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2558 | selectedItems = self.logTree.selectedItems() |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2559 | if len(selectedItems) > 0: |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2560 | revs = [] |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2561 | for itm in selectedItems: |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2562 | rev = itm.text(self.RevisionColumn).split(":", 1)[0] |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2563 | revs.append(rev.strip()) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2564 | |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2565 | bundleData = { |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2566 | "revs": revs, |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2567 | "base": "", |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2568 | "all": False, |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2569 | } |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2570 | |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2571 | self.vcs.hgBundle(bundleData=bundleData) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2572 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2573 | @pyqtSlot() |
5514
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2574 | def __unbundleActTriggered(self): |
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2575 | """ |
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2576 | Private slot to apply the currently previewed bundle file. |
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2577 | """ |
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2578 | if self.initialCommandMode == "incoming" and bool(self.__bundle): |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2579 | shouldReopen = self.vcs.hgUnbundle(files=[self.__bundle]) |
5514
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2580 | if shouldReopen: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2581 | res = EricMessageBox.yesNo( |
5514
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2582 | None, |
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2583 | self.tr("Apply Changegroup"), |
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2584 | self.tr("""The project should be reread. Do this now?"""), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2585 | yesDefault=True, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2586 | ) |
5514
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2587 | if res: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2588 | ericApp().getObject("Project").reopenProject() |
5514
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2589 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2590 | |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2591 | self.vcs.vcsLogBrowser() |
5670
7296fc0fae6d
Changed the Mercurial log browser dialog to switch to log mode after applying a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5624
diff
changeset
|
2592 | self.close() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2593 | |
5514
1aa13333eb9f
Added a an entry to apply the currently previewed changegroup file to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5513
diff
changeset
|
2594 | @pyqtSlot() |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2595 | def __gpgSignActTriggered(self): |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2596 | """ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2597 | Private slot to sign the selected revisions. |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2598 | """ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2599 | revs = [] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2600 | for itm in [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2601 | item |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2602 | for item in self.logTree.selectedItems() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2603 | if not item.data(0, self.__incomingRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2604 | ]: |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2605 | rev = itm.text(self.RevisionColumn).split(":", 1)[0].strip() |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2606 | if rev: |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2607 | revs.append(rev) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2608 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2609 | if revs: |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2610 | self.vcs.getExtensionObject("gpg").hgGpgSign(revisions=revs) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2611 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2612 | @pyqtSlot() |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2613 | def __gpgVerifyActTriggered(self): |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2614 | """ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2615 | Private slot to verify the signatures of a selected revisions. |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2616 | """ |
7009
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2617 | itm = self.logTree.selectedItems()[0] |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2618 | if not itm.data(0, self.__incomingRole): |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2619 | rev = itm.text(self.RevisionColumn).split(":", 1)[0].strip() |
eaf5ed6ef298
Mercurial Interface:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6986
diff
changeset
|
2620 | if rev: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2621 | self.vcs.getExtensionObject("gpg").hgGpgVerifySignatures(rev=rev) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2622 | |
5503
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2623 | def __selectAllActTriggered(self, select=True): |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2624 | """ |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2625 | Private method to select or unselect all log entries. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2626 | |
5503
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2627 | @param select flag indicating to select all entries |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2628 | @type bool |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2629 | """ |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2630 | blocked = self.logTree.blockSignals(True) |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2631 | for row in range(self.logTree.topLevelItemCount()): |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2632 | self.logTree.topLevelItem(row).setSelected(select) |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2633 | self.logTree.blockSignals(blocked) |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2634 | self.on_logTree_itemSelectionChanged() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2635 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2636 | def __actionMode(self): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2637 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2638 | Private method to get the selected action mode. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2639 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2640 | @return selected action mode (one of 'filter' or 'find') |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2641 | @rtype str |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2642 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2643 | return self.modeComboBox.itemData(self.modeComboBox.currentIndex()) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2644 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2645 | @pyqtSlot(int) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2646 | def on_modeComboBox_currentIndexChanged(self, index): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2647 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2648 | Private slot to react on mode changes. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2649 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2650 | @param index index of the selected entry |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2651 | @type int |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2652 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2653 | mode = self.modeComboBox.itemData(index) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2654 | findMode = mode == "find" |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2655 | filterMode = mode == "filter" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2656 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2657 | self.fromDate.setEnabled(filterMode) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2658 | self.toDate.setEnabled(filterMode) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2659 | self.branchCombo.setEnabled(filterMode) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2660 | self.findPrevButton.setVisible(findMode) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2661 | self.findNextButton.setVisible(findMode) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2662 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2663 | if findMode: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2664 | for topIndex in range(self.logTree.topLevelItemCount()): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2665 | self.logTree.topLevelItem(topIndex).setHidden(False) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2666 | self.logTree.header().setSectionHidden(self.IconColumn, False) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2667 | elif filterMode: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2668 | self.__filterLogs() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2669 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2670 | @pyqtSlot() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2671 | def on_findPrevButton_clicked(self): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2672 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2673 | Private slot to find the previous item matching the entered criteria. |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2674 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2675 | self.__findItem(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2676 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2677 | @pyqtSlot() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2678 | def on_findNextButton_clicked(self): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2679 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2680 | Private slot to find the next item matching the entered criteria. |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2681 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2682 | self.__findItem(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2683 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2684 | def __findItem(self, backwards=False, interactive=False): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2685 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2686 | Private slot to find an item matching the entered criteria. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2687 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2688 | @param backwards flag indicating to search backwards |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2689 | @type bool |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2690 | @param interactive flag indicating an interactive search |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2691 | @type bool |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2692 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2693 | self.__findBackwards = backwards |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2694 | |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2695 | fieldIndex, searchRx, indexIsRole = self.__prepareFieldSearch() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2696 | currentIndex = self.logTree.indexOfTopLevelItem(self.logTree.currentItem()) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2697 | if backwards: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2698 | if interactive: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2699 | indexes = range(currentIndex, -1, -1) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2700 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2701 | indexes = range(currentIndex - 1, -1, -1) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2702 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2703 | if interactive: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2704 | indexes = range(currentIndex, self.logTree.topLevelItemCount()) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2705 | else: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2706 | indexes = range(currentIndex + 1, self.logTree.topLevelItemCount()) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2707 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2708 | for index in indexes: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2709 | topItem = self.logTree.topLevelItem(index) |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2710 | if indexIsRole: |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2711 | if fieldIndex == self.__changesRole: |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2712 | changes = topItem.data(0, self.__changesRole) |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2713 | txt = "\n".join( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2714 | [c["path"] for c in changes] + [c["copyfrom"] for c in changes] |
4060
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2715 | ) |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2716 | else: |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2717 | # Find based on complete message text |
6dc9821fc9c8
Extended the Mercurial log browser search and filter functions to the list of changed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4059
diff
changeset
|
2718 | txt = "\n".join(topItem.data(0, self.__messageRole)) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2719 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2720 | txt = topItem.text(fieldIndex) |
7775
4a1db75550bd
Changed code to not use deprecated 'QRegExp' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7771
diff
changeset
|
2721 | if searchRx.search(txt) is not None: |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2722 | self.logTree.setCurrentItem(self.logTree.topLevelItem(index)) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2723 | break |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2724 | else: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2725 | EricMessageBox.information( |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2726 | self, |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2727 | self.tr("Find Commit"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2728 | self.tr("""'{0}' was not found.""").format(self.rxEdit.text()), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2729 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2730 | |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2731 | def __revisionClicked(self, url): |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2732 | """ |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2733 | Private slot to handle the anchorClicked signal of the changeset |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2734 | details pane. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2735 | |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2736 | @param url URL that was clicked |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2737 | @type QUrl |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2738 | """ |
8659
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2739 | if url.scheme() in ("rev", "chg"): |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2740 | if url.scheme() == "rev": |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2741 | # a parent or child revision was clicked, show the item |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2742 | rev = url.path() |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2743 | searchStr = "{0:>7}:".format(rev) |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2744 | # format must be in sync with item generation format |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2745 | searchFlags = Qt.MatchFlag.MatchStartsWith |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2746 | elif url.scheme() == "chg": |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2747 | # a changeset hash was clicked, show the item |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2748 | changeset = url.path() |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2749 | searchStr = ":{0}".format(changeset[:12]) # max. 12 hash chars |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2750 | # format must be in sync with item generation format |
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2751 | searchFlags = Qt.MatchFlag.MatchContains |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2752 | items = self.logTree.findItems(searchStr, searchFlags, self.RevisionColumn) |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2753 | if items: |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2754 | itm = items[0] |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2755 | if itm.isHidden(): |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2756 | itm.setHidden(False) |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2757 | self.logTree.setCurrentItem(itm) |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2758 | else: |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2759 | # load the next batch and try again |
8659
0e58d3367e92
Mercurial Log Browser: made the grafted from changeset of a commit message a clickable item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8621
diff
changeset
|
2760 | if not self.cancelled and self.nextButton.isEnabled(): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2761 | self.__addFinishCallback(lambda: self.__revisionClicked(url)) |
5490
95db14ec60b2
Added some code to cope with unlimited recursions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5489
diff
changeset
|
2762 | self.on_nextButton_clicked() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2763 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2764 | ########################################################################### |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2765 | ## Diff handling methods below |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2766 | ########################################################################### |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2767 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2768 | def __generateDiffs(self, parent=1): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2769 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2770 | Private slot to generate diff outputs for the selected item. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2771 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2772 | @param parent number of parent to diff against |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2773 | @type int |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2774 | """ |
10922
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2775 | self.diffHighlighter.regenerateRules( |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2776 | { |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2777 | "text": Preferences.getDiffColour("TextColor"), |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2778 | "added": Preferences.getDiffColour("AddedColor"), |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2779 | "removed": Preferences.getDiffColour("RemovedColor"), |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2780 | "replaced": Preferences.getDiffColour("ReplacedColor"), |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2781 | "context": Preferences.getDiffColour("ContextColor"), |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2782 | "header": Preferences.getDiffColour("HeaderColor"), |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2783 | "whitespace": Preferences.getDiffColour("BadWhitespaceColor"), |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2784 | }, |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2785 | Preferences.getEditorOtherFonts("MonospacedFont"), |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2786 | ) |
36a90a94765c
Changed EricCore, EricGraphics, EricGui and some of EricNetwork to allow them to be extracted into an external library later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10690
diff
changeset
|
2787 | |
5518
2c5a6446980a
Little enhancement to the Mercurial log browser diff pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5517
diff
changeset
|
2788 | self.diffEdit.setPlainText(self.tr("Generating differences ...")) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2789 | self.diffLabel.setText(self.tr("Differences")) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2790 | self.diffSelectLabel.clear() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2791 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2792 | selectedItems = self.logTree.selectedItems() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2793 | if len(selectedItems) == 1: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2794 | currentItem = selectedItems[0] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2795 | rev2 = currentItem.text(self.RevisionColumn).split(":", 1)[0] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2796 | parents = currentItem.data(0, self.__parentsRole) |
11039
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2797 | if len(parents) == 0: |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2798 | currentBranch = currentItem.text(self.BranchColumn) |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2799 | itemBelow = self.logTree.itemBelow(currentItem) |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2800 | while ( |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2801 | itemBelow is not None |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2802 | and itemBelow.text(self.BranchColumn) != currentBranch |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2803 | ): |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2804 | # try the next one |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2805 | itemBelow = self.logTree.itemBelow(itemBelow) |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2806 | if itemBelow is None: |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2807 | self.diffEdit.setPlainText( |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2808 | self.tr("No differences available. Get some more log entries.") |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2809 | if self.nextButton.isEnabled() |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2810 | else self.tr("No differences available.") |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2811 | ) |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2812 | else: |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2813 | rev1 = itemBelow.text(self.RevisionColumn).split(":", 1)[0] |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2814 | |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2815 | self.__diffGenerator.start( |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2816 | self.__filename, [rev1, rev2], self.__bundle |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2817 | ) |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2818 | |
aa1bcb26b4b7
Improved the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10928
diff
changeset
|
2819 | elif len(parents) >= parent: |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2820 | self.diffLabel.setText( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2821 | self.tr("Differences to Parent {0}").format(parent) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2822 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2823 | rev1 = parents[parent - 1] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2824 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2825 | self.__diffGenerator.start(self.__filename, [rev1, rev2], self.__bundle) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2826 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2827 | if len(parents) > 1: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2828 | if parent == 1: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2829 | par1 = " 1 " |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2830 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2831 | par1 = '<a href="diff:1"> 1 </a>' |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2832 | if parent == 2: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2833 | par2 = " 2 " |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2834 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2835 | par2 = '<a href="diff:2"> 2 </a>' |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2836 | self.diffSelectLabel.setText( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2837 | self.tr("Diff to Parent {0}{1}").format(par1, par2) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2838 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2839 | elif len(selectedItems) == 2: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2840 | rev2 = int(selectedItems[0].text(self.RevisionColumn).split(":")[0]) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2841 | rev1 = int(selectedItems[1].text(self.RevisionColumn).split(":")[0]) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2842 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2843 | self.__diffGenerator.start( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2844 | self.__filename, [min(rev1, rev2), max(rev1, rev2)], self.__bundle |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2845 | ) |
5562
19f22f304e2c
Implemented a little fix for the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5518
diff
changeset
|
2846 | else: |
19f22f304e2c
Implemented a little fix for the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5518
diff
changeset
|
2847 | self.diffEdit.clear() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2848 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2849 | def __generatorFinished(self): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2850 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2851 | Private slot connected to the finished signal of the diff generator. |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2852 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2853 | diff, errors, fileSeparators = self.__diffGenerator.getResult() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2854 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2855 | if diff: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2856 | self.diffEdit.setPlainText("".join(diff)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2857 | elif errors: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2858 | self.diffEdit.setPlainText("".join(errors)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2859 | else: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2860 | self.diffEdit.setPlainText(self.tr("There is no difference.")) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2861 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2862 | self.saveLabel.setVisible(bool(diff)) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2863 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2864 | if self.__diffUpdatesFiles: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2865 | for oldFileName, newFileName, lineNumber in fileSeparators: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2866 | if oldFileName == newFileName: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2867 | fileName = oldFileName |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2868 | elif oldFileName == "__NULL__": |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2869 | fileName = newFileName |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2870 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2871 | fileName = oldFileName |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2872 | item = QTreeWidgetItem(self.filesTree, ["", fileName, ""]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2873 | item.setData(0, self.__diffFileLineRole, lineNumber) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2874 | self.__resizeColumnsFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2875 | self.__resortFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2876 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2877 | for oldFileName, newFileName, lineNumber in fileSeparators: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2878 | for fileName in (oldFileName, newFileName): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2879 | if fileName != "__NULL__": |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2880 | items = self.filesTree.findItems( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2881 | fileName, Qt.MatchFlag.MatchExactly, 1 |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2882 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2883 | for item in items: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2884 | item.setData(0, self.__diffFileLineRole, lineNumber) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2885 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2886 | tc = self.diffEdit.textCursor() |
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:
7971
diff
changeset
|
2887 | tc.movePosition(QTextCursor.MoveOperation.Start) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2888 | self.diffEdit.setTextCursor(tc) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2889 | self.diffEdit.ensureCursorVisible() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2890 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2891 | @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2892 | def on_filesTree_currentItemChanged(self, current, previous): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2893 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2894 | Private slot called, when the current item of the files tree changes. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2895 | |
10438
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2896 | @param current reference to the new current item |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2897 | @type QTreeWidgetItem |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2898 | @param previous reference to the old current item |
4cd7e5a8b3cf
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10373
diff
changeset
|
2899 | @type QTreeWidgetItem |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2900 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2901 | if current: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2902 | para = current.data(0, self.__diffFileLineRole) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2903 | if para is not None: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2904 | if para == 0: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2905 | tc = self.diffEdit.textCursor() |
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:
7971
diff
changeset
|
2906 | tc.movePosition(QTextCursor.MoveOperation.Start) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2907 | self.diffEdit.setTextCursor(tc) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2908 | self.diffEdit.ensureCursorVisible() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2909 | elif para == -1: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2910 | tc = self.diffEdit.textCursor() |
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:
7971
diff
changeset
|
2911 | tc.movePosition(QTextCursor.MoveOperation.End) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2912 | self.diffEdit.setTextCursor(tc) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2913 | self.diffEdit.ensureCursorVisible() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2914 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2915 | # step 1: move cursor to end |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2916 | tc = self.diffEdit.textCursor() |
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:
7971
diff
changeset
|
2917 | tc.movePosition(QTextCursor.MoveOperation.End) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2918 | self.diffEdit.setTextCursor(tc) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2919 | self.diffEdit.ensureCursorVisible() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2920 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2921 | # step 2: move cursor to desired line |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2922 | tc = self.diffEdit.textCursor() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2923 | delta = tc.blockNumber() - para |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2924 | tc.movePosition( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2925 | QTextCursor.MoveOperation.PreviousBlock, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2926 | QTextCursor.MoveMode.MoveAnchor, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2927 | delta, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2928 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2929 | self.diffEdit.setTextCursor(tc) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2930 | self.diffEdit.ensureCursorVisible() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2931 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2932 | @pyqtSlot(str) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2933 | def on_diffSelectLabel_linkActivated(self, link): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2934 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2935 | Private slot to handle the selection of a diff target. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2936 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2937 | @param link activated link |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2938 | @type str |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2939 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2940 | if ":" in link: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2941 | scheme, parent = link.split(":", 1) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2942 | if scheme == "diff": |
8243
cc717c2ae956
Applied some more code simplifications suggested by the new Simplify checker (Y105: use contextlib.suppress) (batch 2).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8240
diff
changeset
|
2943 | with contextlib.suppress(ValueError): |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2944 | parent = int(parent) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2945 | self.__generateDiffs(parent) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2946 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2947 | @pyqtSlot(str) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2948 | def on_saveLabel_linkActivated(self, link): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2949 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2950 | Private slot to handle the selection of the save link. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2951 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2952 | @param link activated link |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2953 | @type str |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2954 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2955 | if ":" not in link: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2956 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2957 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2958 | scheme, rest = link.split(":", 1) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2959 | if scheme != "save" or rest != "me": |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2960 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2961 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2962 | if self.projectMode: |
8814
59bae82bf176
Fixed an issue saving a diff from the Mercurial log browser dialog in project mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8659
diff
changeset
|
2963 | if self.__filename is None: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2964 | fname = "{0}.diff".format( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2965 | os.path.splitext(ericApp().getObject("Project").getProjectFile())[0] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2966 | ) |
8814
59bae82bf176
Fixed an issue saving a diff from the Mercurial log browser dialog in project mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8659
diff
changeset
|
2967 | else: |
59bae82bf176
Fixed an issue saving a diff from the Mercurial log browser dialog in project mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8659
diff
changeset
|
2968 | fname = self.vcs.splitPath(self.__filename)[0] |
59bae82bf176
Fixed an issue saving a diff from the Mercurial log browser dialog in project mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8659
diff
changeset
|
2969 | fname += "/{0}.diff".format(os.path.split(fname)[-1]) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2970 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2971 | dname, fname = self.vcs.splitPath(self.__filename) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2972 | if fname != ".": |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2973 | fname = "{0}.diff".format(self.__filename) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2974 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2975 | fname = dname |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2976 | |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2977 | fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter( |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2978 | self, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2979 | self.tr("Save Diff"), |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2980 | fname, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2981 | self.tr("Patch Files (*.diff)"), |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2982 | None, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2983 | EricFileDialog.DontConfirmOverwrite, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2984 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2985 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2986 | if not fname: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2987 | return # user aborted |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2988 | |
9152
8a68afaf1ba2
Started replacing the use of "QFileInfo()" with Python equivalents.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8881
diff
changeset
|
2989 | fpath = pathlib.Path(fname) |
8a68afaf1ba2
Started replacing the use of "QFileInfo()" with Python equivalents.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8881
diff
changeset
|
2990 | if not fpath.suffix: |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2991 | ex = selectedFilter.split("(*")[1].split(")")[0] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2992 | if ex: |
9152
8a68afaf1ba2
Started replacing the use of "QFileInfo()" with Python equivalents.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8881
diff
changeset
|
2993 | fpath = fpath.with_suffix(ex) |
8a68afaf1ba2
Started replacing the use of "QFileInfo()" with Python equivalents.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8881
diff
changeset
|
2994 | if fpath.exists(): |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
2995 | res = EricMessageBox.yesNo( |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2996 | self, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2997 | self.tr("Save Diff"), |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
2998 | self.tr( |
9576
be9f8e7e42e0
Corrected some 'wrong' string quotes caused by the Black line merging.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2999 | "<p>The patch file <b>{0}</b> already exists. Overwrite it?</p>" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3000 | ).format(fpath), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3001 | icon=EricMessageBox.Warning, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3002 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3003 | if not res: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3004 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3005 | |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
3006 | eol = ericApp().getObject("Project").getEolString() |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3007 | try: |
9152
8a68afaf1ba2
Started replacing the use of "QFileInfo()" with Python equivalents.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8881
diff
changeset
|
3008 | with fpath.open("w", encoding="utf-8", newline="") as f: |
7785
9978016560ec
Changed code to use context manager 'open()' for file operations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7779
diff
changeset
|
3009 | f.write(eol.join(self.diffEdit.toPlainText().splitlines())) |
7836
2f0d208b8137
Changed code to not use the OSError aliases (IOError, EnvironmentError, socket.error and select.error) anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7785
diff
changeset
|
3010 | except OSError as why: |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8322
diff
changeset
|
3011 | EricMessageBox.critical( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3012 | self, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3013 | self.tr("Save Diff"), |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3014 | self.tr( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3015 | "<p>The patch file <b>{0}</b> could not be saved." |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3016 | "<br>Reason: {1}</p>" |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3017 | ).format(fpath, str(why)), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3018 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3019 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3020 | @pyqtSlot(str) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3021 | def on_sbsSelectLabel_linkActivated(self, link): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3022 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3023 | Private slot to handle selection of a side-by-side link. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
3024 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3025 | @param link text of the selected link |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3026 | @type str |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3027 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
3028 | if ":" in link and self.__filename is not None: |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3029 | scheme, path = link.split(":", 1) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3030 | if scheme == "sbsdiff" and "_" in path: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
3031 | rev1, rev2 = path.split("_", 1) |
8621
8c9f41115c04
Continued implementing the VCS status widget for the left side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8358
diff
changeset
|
3032 | self.vcs.vcsSbsDiff(self.__filename, revisions=(rev1, rev2)) |
10215
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3033 | |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3034 | def __selectBranches(self, stateFilter=None): |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3035 | """ |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3036 | Private slot to select the branches to be shown. |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3037 | |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3038 | @param stateFilter list of state filters ("", "C" or "I") to be presented for |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3039 | selection (None or empty list means all) (defaults to None) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3040 | @type list of str (optional) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3041 | """ |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3042 | from eric7.EricWidgets.EricListSelectionDialog import EricListSelectionDialog |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3043 | |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3044 | states = { |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3045 | "C": self.tr("closed"), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3046 | "I": self.tr("inactive"), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3047 | } |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3048 | |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3049 | if not stateFilter: |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3050 | stateFilter = ["", "C", "I"] |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3051 | |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3052 | rawBranchesList = self.vcs.hgGetBranchesList(withState=True, withDefault=True) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3053 | branchesList = sorted( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3054 | ( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3055 | b[0] if b[1] == "" else self.tr("{0} ({1})").format(b[0], states[b[1]]), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3056 | b[0], |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3057 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3058 | for b in rawBranchesList |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3059 | if b[1] in stateFilter |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3060 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3061 | dlg = EricListSelectionDialog( |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3062 | branchesList, |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3063 | title=self.tr("Select Branches"), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3064 | message=self.tr("Select the branches to be shown (none for 'All'):"), |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3065 | checkBoxSelection=True, |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3066 | emptySelectionOk=True, |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3067 | showSelectAll=True, |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3068 | parent=self, |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3069 | ) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3070 | dlg.setSelection(self.__branchesFilterList) |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3071 | if dlg.exec() == QDialog.DialogCode.Accepted: |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3072 | self.__branchesFilterList = [b[1] for b in dlg.getSelection()] |
d476667171a1
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10214
diff
changeset
|
3073 | self.on_refreshButton_clicked() |