Sun, 26 Feb 2017 15:16:35 +0100
Implemented a little fix for the Mercurial log browser dialog.
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 | |
5389
9b1c800daff3
Updated copyright for 2017.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5353
diff
changeset
|
3 | # Copyright (c) 2010 - 2017 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 | |
3145
a9de05d4a22f
# __IGNORE_WARNING__ added/ removed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3060
diff
changeset
|
10 | from __future__ import unicode_literals |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2444
diff
changeset
|
11 | try: |
3484 | 12 | str = unicode |
13 | except NameError: | |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2444
diff
changeset
|
14 | pass |
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2444
diff
changeset
|
15 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | import os |
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
|
17 | import re |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
18 | import collections |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
20 | from PyQt5.QtCore import pyqtSlot, qVersion, Qt, QDate, QProcess, QTimer, \ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
21 | QRegExp, QSize, QPoint, QFileInfo |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
22 | from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QBrush, \ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
23 | QIcon, QTextCursor |
3656
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3591
diff
changeset
|
24 | from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
25 | QTreeWidgetItem, QApplication, QLineEdit, QMenu, QInputDialog, QToolTip |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | |
207
3f889378dede
Added some code to inspect incoming patches as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
27 | from E5Gui.E5Application import e5App |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
28 | from E5Gui import E5MessageBox, E5FileDialog |
207
3f889378dede
Added some code to inspect incoming patches as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
29 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
32 | from .HgDiffHighlighter import HgDiffHighlighter |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
33 | from .HgDiffGenerator import HgDiffGenerator |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
34 | |
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
|
35 | import UI.PixmapCache |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
36 | import Preferences |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
37 | import Utilities |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
39 | COLORNAMES = ["blue", "darkgreen", "red", "green", "darkblue", "purple", |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
40 | "cyan", "olive", "magenta", "darkred", "darkmagenta", |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
41 | "darkcyan", "gray", "yellow"] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
42 | COLORS = [str(QColor(x).name()) for x in COLORNAMES] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
43 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
44 | |
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
|
45 | class HgLogBrowserDialog(QWidget, Ui_HgLogBrowserDialog): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | 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
|
48 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
49 | 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
|
50 | BranchColumn = 1 |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
51 | RevisionColumn = 2 |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
52 | PhaseColumn = 3 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
53 | AuthorColumn = 4 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
54 | DateColumn = 5 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
55 | MessageColumn = 6 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
56 | 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
|
57 | BookmarksColumn = 8 |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
58 | |
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
|
59 | 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
|
60 | 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
|
61 | PathSeparatorRe = re.compile(r"/|\\") |
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
|
62 | |
3554
9ca56a89aec5
A liitle enhancement and a fix to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
63 | ClosedIndicator = " \u2612" |
9ca56a89aec5
A liitle enhancement and a fix to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
64 | |
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
|
65 | def __init__(self, vcs, mode="log", parent=None): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | Constructor |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | @param vcs reference to the vcs object |
215
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
70 | @param mode mode of the dialog (string; one of log, incoming, outgoing) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | @param parent parent widget (QWidget) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | """ |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2444
diff
changeset
|
73 | super(HgLogBrowserDialog, self).__init__(parent) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | self.setupUi(self) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
76 | windowFlags = self.windowFlags() |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
77 | windowFlags |= Qt.WindowContextHelpButtonHint |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
78 | self.setWindowFlags(windowFlags) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
79 | |
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
|
80 | 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
|
81 | 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
|
82 | 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
|
83 | 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
|
84 | self.diffSplitter.setStretchFactor(1, 2) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
85 | |
782
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
86 | 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
|
87 | 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
|
88 | 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
|
89 | 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
|
90 | 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
|
91 | self.setWindowTitle(self.tr("Mercurial Log (Outgoing)")) |
782
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
92 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | |
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
|
99 | self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) |
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
|
100 | self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) |
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
|
101 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
102 | self.refreshButton = self.buttonBox.addButton( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
103 | self.tr("&Refresh"), QDialogButtonBox.ActionRole) |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
104 | self.refreshButton.setToolTip( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
105 | self.tr("Press to refresh the list of changesets")) |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
106 | self.refreshButton.setEnabled(False) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
107 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
108 | self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
109 | self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
110 | self.__findBackwards = False |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
111 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
112 | 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
|
113 | self.modeComboBox.addItem(self.tr("Filter"), "filter") |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
114 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
115 | 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
|
116 | 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
|
117 | 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
|
118 | self.fieldCombo.addItem(self.tr("File"), "file") |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
119 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
120 | font = Preferences.getEditorOtherFonts("MonospacedFont") |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
121 | self.diffEdit.setFontFamily(font.family()) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
122 | self.diffEdit.setFontPointSize(font.pointSize()) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
123 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
124 | 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
|
125 | 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
|
126 | self.__diffGenerator.finished.connect(self.__generatorFinished) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
127 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | self.vcs = vcs |
181
4af57f97c1bc
Added code to choose the way incoming and outgoing logs are shown.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
129 | if mode in ("log", "incoming", "outgoing"): |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
130 | 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
|
131 | 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
|
132 | else: |
215
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
133 | 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
|
134 | 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
|
135 | self.__hgClient = vcs.getClient() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
136 | |
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
|
137 | 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
|
138 | "<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
|
139 | "<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
|
140 | "<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
|
141 | "<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
|
142 | "<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
|
143 | "{4}" |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
144 | "<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
|
145 | "</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
|
146 | ) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
147 | self.__parentsTemplate = self.tr( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
148 | "<tr><td><b>Parents</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
|
149 | ) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
150 | 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
|
151 | "<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
|
152 | ) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
153 | self.__tagsTemplate = self.tr( |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
154 | "<tr><td><b>Tags</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
|
155 | ) |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
156 | 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
|
157 | "<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
|
158 | ) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
159 | 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
|
160 | "<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
|
161 | ) |
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
|
162 | |
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
|
163 | 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
|
164 | 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
|
165 | 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
|
166 | self.__selectedRevisions = [] |
4250
d3bd7c3dcb80
Fixed issues in the Subversion and Mercurial log browser windows.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4080
diff
changeset
|
167 | self.intercept = 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
|
168 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
169 | self.__initData() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
170 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
171 | self.__allBranchesFilter = self.tr("All") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | self.fromDate.setDisplayFormat("yyyy-MM-dd") |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | 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
|
175 | self.__resetUI() |
779
04c3a6026543
Fixed an issue where long incoming patchsets were not shown completely.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
176 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
177 | # roles used in the log tree |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | self.__messageRole = Qt.UserRole |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
179 | self.__changesRole = Qt.UserRole + 1 |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
180 | self.__edgesRole = Qt.UserRole + 2 |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
181 | self.__parentsRole = Qt.UserRole + 3 |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
182 | self.__latestTagRole = Qt.UserRole + 4 |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
184 | # roles used in the file tree |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
185 | self.__diffFileLineRole = Qt.UserRole |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
186 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
187 | if self.__hgClient: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
188 | self.process = None |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
189 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
190 | self.process = QProcess() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
191 | self.process.finished.connect(self.__procFinished) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
192 | self.process.readyReadStandardOutput.connect(self.__readStdout) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
193 | self.process.readyReadStandardError.connect(self.__readStderr) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | self.flags = { |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
196 | 'A': self.tr('Added'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
197 | 'D': self.tr('Deleted'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
198 | 'M': self.tr('Modified'), |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | } |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
200 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
201 | self.phases = { |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
202 | 'draft': self.tr("Draft"), |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
203 | 'public': self.tr("Public"), |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
204 | 'secret': self.tr("Secret"), |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
205 | } |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
206 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
207 | self.__dotRadius = 8 |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
208 | self.__rowHeight = 20 |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
209 | |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
210 | self.logTree.setIconSize( |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
211 | 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
|
212 | self.BookmarksColumn = self.logTree.columnCount() |
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
|
213 | self.logTree.headerItem().setText( |
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
|
214 | self.BookmarksColumn, self.tr("Bookmarks")) |
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
|
215 | |
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
|
216 | 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
|
217 | 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
|
218 | 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
|
219 | self.__logTreeBoldFont.setBold(True) |
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
|
220 | |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
221 | self.detailsEdit.anchorClicked.connect(self.__revisionClicked) |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
222 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
223 | self.__initActionsMenu() |
5450
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
224 | |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
225 | 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
|
226 | |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
227 | 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
|
228 | """ |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
229 | Private method to add a method to be called once the process finished. |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
230 | |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
231 | 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
|
232 | a callback method needs to be called again, it must be added again. |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
233 | |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
234 | @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
|
235 | @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
|
236 | """ |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
237 | 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
|
238 | self.__finishCallbacks.append(callback) |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
239 | |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
240 | def __initActionsMenu(self): |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
241 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
242 | 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
|
243 | """ |
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
|
244 | 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
|
245 | self.__actionsMenu.setTearOffEnabled(True) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
246 | if qVersion() >= "5.1.0": |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
247 | self.__actionsMenu.setToolTipsVisible(True) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
248 | else: |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
249 | self.__actionsMenu.hovered.connect(self.__actionsMenuHovered) |
5496
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
250 | |
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
|
251 | self.__graftAct = self.__actionsMenu.addAction( |
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
|
252 | UI.PixmapCache.getIcon("vcsGraft.png"), |
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
|
253 | self.tr("Copy Changesets"), self.__graftActTriggered) |
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
|
254 | self.__graftAct.setToolTip(self.tr( |
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
|
255 | "Copy the selected changesets to the current branch")) |
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
|
256 | |
5496
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
257 | self.__mergeAct = self.__actionsMenu.addAction( |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
258 | UI.PixmapCache.getIcon("vcsMerge.png"), |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
259 | self.tr("Merge with Changeset"), self.__mergeActTriggered) |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
260 | self.__mergeAct.setToolTip(self.tr( |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
261 | "Merge the working directory with the selected changeset")) |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
262 | |
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
|
263 | self.__phaseAct = self.__actionsMenu.addAction( |
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
|
264 | self.tr("Change Phase"), self.__phaseActTriggered) |
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
|
265 | self.__phaseAct.setToolTip(self.tr( |
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
|
266 | "Change the phase of the selected revisions")) |
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
|
267 | self.__phaseAct.setWhatsThis(self.tr( |
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
|
268 | """<b>Change Phase</b>\n<p>This changes the phase of the""" |
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
|
269 | """ selected revisions. The selected revisions have to have""" |
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
|
270 | """ the same current phase.</p>""")) |
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
|
271 | |
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
|
272 | self.__tagAct = self.__actionsMenu.addAction( |
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
|
273 | UI.PixmapCache.getIcon("vcsTag.png"), self.tr("Tag"), |
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
|
274 | self.__tagActTriggered) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
275 | self.__tagAct.setToolTip(self.tr("Tag the selected revision")) |
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
|
276 | |
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
|
277 | self.__switchAct = self.__actionsMenu.addAction( |
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
|
278 | UI.PixmapCache.getIcon("vcsSwitch.png"), self.tr("Switch"), |
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
|
279 | self.__switchActTriggered) |
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
|
280 | self.__switchAct.setToolTip(self.tr( |
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
|
281 | "Switch the working directory to the 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
|
282 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
283 | self.__actionsMenu.addSeparator() |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
284 | |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
285 | self.__bookmarkAct = self.__actionsMenu.addAction( |
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
|
286 | UI.PixmapCache.getIcon("addBookmark.png"), |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
287 | self.tr("Define Bookmark..."), self.__bookmarkActTriggered) |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
288 | self.__bookmarkAct.setToolTip( |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
289 | self.tr("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
|
290 | self.__bookmarkMoveAct = self.__actionsMenu.addAction( |
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
|
291 | UI.PixmapCache.getIcon("moveBookmark.png"), |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
292 | self.tr("Move Bookmark..."), self.__bookmarkMoveActTriggered) |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
293 | self.__bookmarkMoveAct.setToolTip( |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
294 | self.tr("Move 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
|
295 | |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
296 | self.__actionsMenu.addSeparator() |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
297 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
298 | self.__pullAct = self.__actionsMenu.addAction( |
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
|
299 | UI.PixmapCache.getIcon("vcsUpdate.png"), self.tr("Pull Changes"), |
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
|
300 | self.__pullActTriggered) |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
301 | self.__pullAct.setToolTip(self.tr( |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
302 | "Pull changes from a remote repository")) |
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
|
303 | self.__lfPullAct = self.__actionsMenu.addAction( |
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
|
304 | self.tr("Pull Large Files"), self.__lfPullActTriggered) |
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
|
305 | self.__lfPullAct.setToolTip(self.tr( |
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
|
306 | "Pull large files for selected revisions")) |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
307 | self.__fetchAct = self.__actionsMenu.addAction( |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
308 | self.tr("Fetch Changes"), self.__fetchActTriggered) |
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
|
309 | self.__fetchAct.setToolTip(self.tr( |
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
|
310 | "Fetch changes from a remote repository")) |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
311 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
312 | self.__actionsMenu.addSeparator() |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
313 | |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
314 | self.__pushAct = self.__actionsMenu.addAction( |
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
|
315 | UI.PixmapCache.getIcon("vcsCommit.png"), |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
316 | self.tr("Push Selected Changes"), self.__pushActTriggered) |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
317 | self.__pushAct.setToolTip(self.tr( |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
318 | "Push changes of the selected changeset and its ancestors" |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
319 | " 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
|
320 | self.__pushAllAct = self.__actionsMenu.addAction( |
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
|
321 | UI.PixmapCache.getIcon("vcsCommit.png"), |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
322 | self.tr("Push All Changes"), self.__pushAllActTriggered) |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
323 | self.__pushAllAct.setToolTip(self.tr( |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
324 | "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
|
325 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
326 | self.__actionsMenu.addSeparator() |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
327 | |
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
|
328 | self.__bundleAct = self.__actionsMenu.addAction( |
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
|
329 | UI.PixmapCache.getIcon("vcsCreateChangegroup.png"), |
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
|
330 | self.tr("Create Changegroup"), self.__bundleActTriggered) |
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
|
331 | self.__bundleAct.setToolTip(self.tr( |
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
|
332 | "Create a changegroup file containing the selected changesets")) |
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
|
333 | self.__bundleAct.setWhatsThis(self.tr( |
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
|
334 | """<b>Create Changegroup</b>\n<p>This creates a changegroup""" |
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
|
335 | """ file containing the selected revisions. If no revisions""" |
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
|
336 | """ are selected, all changesets will be bundled. If one""" |
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
|
337 | """ revision is selected, it will be interpreted as the base""" |
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
|
338 | """ revision. Otherwise the lowest revision will be used as""" |
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
|
339 | """ the base revision and all other revision will be bundled.""" |
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
|
340 | """ If the dialog is showing outgoing changesets, all""" |
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
|
341 | """ selected changesets will be bundled.</p>""")) |
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
|
342 | self.__unbundleAct = self.__actionsMenu.addAction( |
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
|
343 | UI.PixmapCache.getIcon("vcsApplyChangegroup.png"), |
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
|
344 | self.tr("Apply Changegroup"), self.__unbundleActTriggered) |
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
|
345 | self.__unbundleAct.setToolTip(self.tr( |
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
|
346 | "Apply the currently viewed changegroup file")) |
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
|
347 | |
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
|
348 | self.__actionsMenu.addSeparator() |
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
|
349 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
350 | self.__gpgSignAct = self.__actionsMenu.addAction( |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
351 | UI.PixmapCache.getIcon("changesetSign.png"), |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
352 | self.tr("Sign Revisions"), self.__gpgSignActTriggered) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
353 | self.__gpgSignAct.setToolTip(self.tr( |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
354 | "Add a signature for 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
|
355 | self.__gpgVerifyAct = self.__actionsMenu.addAction( |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
356 | UI.PixmapCache.getIcon("changesetSignVerify.png"), |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
357 | self.tr("Verify Signatures"), self.__gpgVerifyActTriggered) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
358 | self.__gpgVerifyAct.setToolTip(self.tr( |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
359 | "Verify all signatures there may be for the selected revision")) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
360 | |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
361 | self.__actionsMenu.addSeparator() |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
362 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
363 | self.__stripAct = self.__actionsMenu.addAction( |
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
|
364 | UI.PixmapCache.getIcon("fileDelete.png"), |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
365 | self.tr("Strip Changesets"), self.__stripActTriggered) |
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
|
366 | self.__stripAct.setToolTip(self.tr( |
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
|
367 | "Strip changesets from a repository")) |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
368 | |
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
|
369 | self.__actionsMenu.addSeparator() |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
370 | |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
371 | self.__selectAllAct = self.__actionsMenu.addAction( |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
372 | self.tr("Select All Entries"), self.__selectAllActTriggered) |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
373 | self.__unselectAllAct = self.__actionsMenu.addAction( |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
374 | self.tr("Deselect 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
|
375 | lambda: self.__selectAllActTriggered(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
|
376 | |
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
|
377 | self.actionsButton.setIcon( |
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
|
378 | UI.PixmapCache.getIcon("actionsToolButton.png")) |
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
|
379 | self.actionsButton.setMenu(self.__actionsMenu) |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
380 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
381 | def __actionsMenuHovered(self, action): |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
382 | """ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
383 | Private slot to show the tooltip for an action menu entry. |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
384 | |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
385 | @param action action to show tooltip for |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
386 | @type QAction |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
387 | """ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
388 | QToolTip.showText( |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
389 | QCursor.pos(), action.toolTip(), |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
390 | self.__actionsMenu, self.__actionsMenu.actionGeometry(action)) |
5487
7ce9c29cd26f
Added some TODOs to further enhance the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5486
diff
changeset
|
391 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
392 | def __initData(self): |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
393 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
394 | Private method to (re-)initialize some data. |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
395 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
396 | self.__maxDate = QDate() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
397 | self.__minDate = QDate() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
398 | self.__filterLogsEnabled = True |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
399 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
400 | self.buf = [] # buffer for stdout |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
401 | self.diff = None |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
402 | self.__started = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
403 | self.__lastRev = 0 |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
404 | self.projectMode = False |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
405 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
406 | # attributes to store log graph data |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
407 | self.__revs = [] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
408 | self.__revColors = {} |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
409 | self.__revColor = 0 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
410 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
411 | self.__branchColors = {} |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
412 | |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
413 | self.__projectRevision = -1 |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
414 | self.__projectBranch = "" |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
415 | |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
416 | self.__childrenInfo = collections.defaultdict(list) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
417 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
418 | def closeEvent(self, e): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
419 | """ |
3591
2f2a4a76dd22
Corrected a bunch of source docu issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
420 | Protected slot implementing a close event handler. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
421 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
422 | @param e close event (QCloseEvent) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
423 | """ |
1256
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
424 | if self.__hgClient: |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
425 | if self.__hgClient.isExecuting(): |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
426 | self.__hgClient.cancel() |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
427 | else: |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
428 | if self.process is not None and \ |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
429 | self.process.state() != QProcess.NotRunning: |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
430 | self.process.terminate() |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
431 | QTimer.singleShot(2000, self.process.kill) |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
432 | self.process.waitForFinished(3000) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
433 | |
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
|
434 | self.vcs.getPlugin().setPreferences( |
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
|
435 | "LogBrowserGeometry", self.saveGeometry()) |
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
|
436 | self.vcs.getPlugin().setPreferences( |
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
|
437 | "LogBrowserSplitterStates", [ |
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
|
438 | 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
|
439 | 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
|
440 | self.diffSplitter.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
|
441 | ] |
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
|
442 | ) |
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
|
443 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
444 | e.accept() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
445 | |
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
|
446 | 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
|
447 | """ |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
448 | 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
|
449 | """ |
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
|
450 | 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
|
451 | 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
|
452 | self.__resetUI() |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
453 | |
3484 | 454 | super(HgLogBrowserDialog, self).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
|
455 | |
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
|
456 | 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
|
457 | """ |
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
|
458 | 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
|
459 | """ |
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
|
460 | 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
|
461 | 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
|
462 | 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
|
463 | 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
|
464 | 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
|
465 | self.restoreGeometry(geom) |
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
|
466 | |
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
|
467 | 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
|
468 | """ |
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
|
469 | 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
|
470 | """ |
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
|
471 | states = self.vcs.getPlugin().getPreferences( |
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
|
472 | "LogBrowserSplitterStates") |
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
|
473 | 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
|
474 | # 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
|
475 | 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
|
476 | 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
|
477 | self.diffSplitter.restoreState(states[2]) |
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
|
478 | |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
479 | 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
|
480 | """ |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
481 | 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
|
482 | """ |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
483 | 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
|
484 | 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
|
485 | 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
|
486 | self.fieldCombo.setCurrentIndex(self.fieldCombo.findData("message")) |
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
|
487 | self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences( |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
488 | "LogLimit")) |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
489 | self.stopCheckBox.setChecked(self.vcs.getPlugin().getPreferences( |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
490 | "StopLogOnCopy")) |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
491 | |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
492 | 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
|
493 | 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
|
494 | 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
|
495 | 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
|
496 | 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
|
497 | self.limitSpinBox.setEnabled(True) |
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
|
498 | |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
499 | self.logTree.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
|
500 | |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
501 | self.commandMode = self.initialCommandMode |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
502 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
503 | def __resizeColumnsLog(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
504 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
505 | 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
|
506 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
507 | self.logTree.header().resizeSections(QHeaderView.ResizeToContents) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
508 | self.logTree.header().setStretchLastSection(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
509 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
510 | def __resizeColumnsFiles(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
511 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
512 | 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
|
513 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
514 | self.filesTree.header().resizeSections(QHeaderView.ResizeToContents) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
515 | self.filesTree.header().setStretchLastSection(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
516 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
517 | def __resortFiles(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
518 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
519 | 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
|
520 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
521 | sortColumn = self.filesTree.sortColumn() |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
522 | self.filesTree.sortItems( |
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
523 | 1, self.filesTree.header().sortIndicatorOrder()) |
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
524 | self.filesTree.sortItems( |
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
525 | sortColumn, self.filesTree.header().sortIndicatorOrder()) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
526 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
527 | def __getColor(self, n): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
528 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
529 | Private method to get the (rotating) name of the color given an index. |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
530 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
531 | @param n color index (integer) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
532 | @return color name (string) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
533 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
534 | return COLORS[n % len(COLORS)] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
535 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
536 | def __branchColor(self, branchName): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
537 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
538 | Private method to calculate a color for a given branch name. |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
539 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
540 | @param branchName name of the branch (string) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
541 | @return name of the color to use (string) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
542 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
543 | if branchName not in self.__branchColors: |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
544 | self.__branchColors[branchName] = self.__getColor( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
545 | len(self.__branchColors)) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
546 | return self.__branchColors[branchName] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
547 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
548 | def __generateEdges(self, rev, parents): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
549 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
550 | Private method to generate edge info for the give data. |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
551 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
552 | @param rev revision to calculate edge info for (integer) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
553 | @param parents list of parent revisions (list of integers) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
554 | @return tuple containing the column and color index for |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
555 | 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
|
556 | between the given node and its parents |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
557 | (integer, integer, [(integer, integer, integer), ...]) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
558 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
559 | if rev not in self.__revs: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
560 | # new head |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
561 | self.__revs.append(rev) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
562 | self.__revColors[rev] = self.__revColor |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
563 | self.__revColor += 1 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
564 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
565 | col = self.__revs.index(rev) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
566 | color = self.__revColors.pop(rev) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
567 | next = self.__revs[:] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
568 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
569 | # add parents to next |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
570 | addparents = [p for p in parents if p not in next] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
571 | next[col:col + 1] = addparents |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
572 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
573 | # set colors for the parents |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
574 | for i, p in enumerate(addparents): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
575 | if not i: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
576 | self.__revColors[p] = color |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
577 | else: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
578 | self.__revColors[p] = self.__revColor |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
579 | self.__revColor += 1 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
580 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
581 | # add edges to the graph |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
582 | edges = [] |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
583 | if parents[0] != -1: |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
584 | for ecol, erev in enumerate(self.__revs): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
585 | if erev in next: |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
586 | edges.append( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
587 | (ecol, next.index(erev), self.__revColors[erev])) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
588 | elif erev == rev: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
589 | for p in parents: |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
590 | edges.append( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
591 | (ecol, next.index(p), self.__revColors[p])) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
592 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
593 | self.__revs = next |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
594 | return col, color, edges |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
595 | |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
596 | def __generateIcon(self, column, color, bottomedges, topedges, dotColor, |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
597 | currentRev, closed): |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
598 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
599 | 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
|
600 | given data. |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
601 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
602 | @param column column index of the revision (integer) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
603 | @param color color of the node (integer) |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
604 | @param bottomedges list of edges for the bottom of the node |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
605 | (list of tuples of three integers) |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
606 | @param topedges list of edges for the top of the node |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
607 | (list of tuples of three integers) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
608 | @param dotColor color to be used for the dot (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
|
609 | @param currentRev flag indicating to draw the icon for the |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
610 | current revision (boolean) |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
611 | @param closed flag indicating to draw an icon for a closed |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
612 | branch (boolean) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
613 | @return icon for the node (QIcon) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
614 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
615 | 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
|
616 | """ |
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
|
617 | Local function to calculate a x-position for a column. |
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
|
618 | |
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
|
619 | @param col column number (integer) |
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
|
620 | @param radius radius of the indicator circle (integer) |
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
|
621 | """ |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
622 | return int(1.2 * radius) * col + radius // 2 + 3 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
623 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
624 | radius = self.__dotRadius |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
625 | w = len(bottomedges) * radius + 20 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
626 | h = self.__rowHeight |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
627 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
628 | dot_x = col2x(column, radius) - radius // 2 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
629 | dot_y = h // 2 |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
630 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
631 | pix = QPixmap(w, h) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
632 | pix.fill(QColor(0, 0, 0, 0)) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
633 | painter = QPainter(pix) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
634 | painter.setRenderHint(QPainter.Antialiasing) |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
635 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
636 | pen = QPen(Qt.blue) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
637 | pen.setWidth(2) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
638 | painter.setPen(pen) |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
639 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
640 | lpen = QPen(pen) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
641 | lpen.setColor(Qt.black) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
642 | painter.setPen(lpen) |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
643 | |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
644 | # draw the revision history lines |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
645 | for y1, y2, lines in ((0, h, bottomedges), |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
646 | (-h, 0, topedges)): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
647 | if lines: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
648 | for start, end, ecolor in lines: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
649 | lpen = QPen(pen) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
650 | lpen.setColor(QColor(self.__getColor(ecolor))) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
651 | lpen.setWidth(2) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
652 | painter.setPen(lpen) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
653 | x1 = col2x(start, radius) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
654 | x2 = col2x(end, radius) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
655 | painter.drawLine(x1, dot_y + y1, x2, dot_y + y2) |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
656 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
657 | penradius = 1 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
658 | pencolor = Qt.black |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
659 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
660 | dot_y = (h // 2) - radius // 2 |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
661 | |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
662 | # draw a dot for the revision |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
663 | if currentRev: |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
664 | # enlarge dot 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
|
665 | 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
|
666 | 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
|
667 | 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
|
668 | 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
|
669 | penradius = 3 |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
670 | painter.setBrush(dotColor) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
671 | pen = QPen(pencolor) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
672 | pen.setWidth(penradius) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
673 | 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
|
674 | if closed: |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
675 | painter.drawRect(dot_x - 2, dot_y + 1, |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
676 | radius + 4, radius - 2) |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
677 | 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
|
678 | offset = radius // 2 |
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
|
679 | painter.drawConvexPolygon( |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
680 | QPoint(dot_x + offset, dot_y), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
681 | QPoint(dot_x, dot_y + offset), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
682 | QPoint(dot_x + offset, dot_y + 2 * offset), |
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
|
683 | QPoint(dot_x + 2 * offset, dot_y + offset) |
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
|
684 | ) |
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
|
685 | 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
|
686 | painter.drawEllipse(dot_x, dot_y, radius, radius) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
687 | painter.end() |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
688 | return QIcon(pix) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
689 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
690 | def __getParents(self, rev): |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
691 | """ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
692 | 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
|
693 | file/directory. |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
694 | |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
695 | @param rev revision number to get parents for (string) |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
696 | @return list of parent revisions (list of integers) |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
697 | """ |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
698 | errMsg = "" |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
699 | parents = [-1] |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
700 | |
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
|
701 | if int(rev) > 0: |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
702 | args = self.vcs.initCommand("parents") |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
703 | 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
|
704 | if self.__bundle: |
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
|
705 | args.append("--repository") |
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
|
706 | args.append(self.__bundle) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
707 | elif self.vcs.bundleFile and \ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
708 | os.path.exists(self.vcs.bundleFile): |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
709 | args.append("--repository") |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
710 | args.append(self.vcs.bundleFile) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
711 | args.append("--template") |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
712 | args.append("{rev}\n") |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
713 | args.append("-r") |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
714 | args.append(rev) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
715 | 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
|
716 | args.append(self.__filename) |
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
|
717 | |
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
|
718 | 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
|
719 | if self.__hgClient: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
720 | output, errMsg = self.__hgClient.runcommand(args) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
721 | else: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
722 | process = QProcess() |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
723 | process.setWorkingDirectory(self.repodir) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
724 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2731
diff
changeset
|
725 | procStarted = process.waitForStarted(5000) |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
726 | if procStarted: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
727 | finished = process.waitForFinished(30000) |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
728 | if finished and process.exitCode() == 0: |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
729 | output = str(process.readAllStandardOutput(), |
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
730 | self.vcs.getEncoding(), 'replace') |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
731 | else: |
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
732 | if not finished: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
733 | errMsg = self.tr( |
2581
a3498dcc75cc
Fixed an 'invalid' error message caused by the code trying to get the parents for revision 0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2570
diff
changeset
|
734 | "The hg process did not finish within 30s.") |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
735 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
736 | errMsg = self.tr("Could not start the hg executable.") |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
737 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
738 | if errMsg: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
739 | E5MessageBox.critical( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
740 | self, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
741 | self.tr("Mercurial Error"), |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
742 | errMsg) |
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
|
743 | |
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
|
744 | 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
|
745 | parents = [int(p) for p in output.strip().splitlines()] |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
746 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
747 | return parents |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
748 | |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
749 | 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
|
750 | """ |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
751 | 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
|
752 | """ |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
753 | errMsg = "" |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
754 | |
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
|
755 | 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
|
756 | args.append("-nb") |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
757 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
758 | output = "" |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
759 | if self.__hgClient: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
760 | output, errMsg = self.__hgClient.runcommand(args) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
761 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
762 | process = QProcess() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
763 | process.setWorkingDirectory(self.repodir) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
764 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2731
diff
changeset
|
765 | procStarted = process.waitForStarted(5000) |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
766 | if procStarted: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
767 | finished = process.waitForFinished(30000) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
768 | if finished and process.exitCode() == 0: |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
769 | output = str(process.readAllStandardOutput(), |
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
770 | self.vcs.getEncoding(), 'replace') |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
771 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
772 | if not finished: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
773 | errMsg = self.tr( |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
774 | "The hg process did not finish within 30s.") |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
775 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
776 | errMsg = self.tr("Could not start the hg executable.") |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
777 | |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
778 | if errMsg: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
779 | E5MessageBox.critical( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
780 | self, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
781 | self.tr("Mercurial Error"), |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
782 | errMsg) |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
783 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
784 | if output: |
2544
3868561e3962
Fixed an issue introduced by the last changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2543
diff
changeset
|
785 | 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
|
786 | if len(outputList) == 2: |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
787 | self.__projectRevision = outputList[0].strip() |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
788 | if self.__projectRevision.endswith("+"): |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
789 | self.__projectRevision = self.__projectRevision[:-1] |
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
|
790 | self.__projectBranch = outputList[1].strip() |
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 | |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
792 | def __getClosedBranches(self): |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
793 | """ |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
794 | 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
|
795 | """ |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
796 | self.__closedBranchesRevs = [] |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
797 | errMsg = "" |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
798 | |
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
|
799 | 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
|
800 | args.append("--closed") |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
801 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
802 | output = "" |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
803 | if self.__hgClient: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
804 | output, errMsg = self.__hgClient.runcommand(args) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
805 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
806 | process = QProcess() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
807 | process.setWorkingDirectory(self.repodir) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
808 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2731
diff
changeset
|
809 | procStarted = process.waitForStarted(5000) |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
810 | if procStarted: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
811 | finished = process.waitForFinished(30000) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
812 | if finished and process.exitCode() == 0: |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
813 | output = str(process.readAllStandardOutput(), |
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
814 | self.vcs.getEncoding(), 'replace') |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
815 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
816 | if not finished: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
817 | errMsg = self.tr( |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
818 | "The hg process did not finish within 30s.") |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
819 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
820 | errMsg = self.tr("Could not start the hg executable.") |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
821 | |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
822 | if errMsg: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
823 | E5MessageBox.critical( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
824 | self, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
825 | self.tr("Mercurial Error"), |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
826 | errMsg) |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
827 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
828 | if output: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
829 | 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
|
830 | 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
|
831 | parts = line.split() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
832 | self.__closedBranchesRevs.append( |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
833 | parts[-2].split(":", 1)[0]) |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
834 | |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
835 | 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
|
836 | """ |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
837 | Private method to get the revision of a tag. |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
838 | |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
839 | @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
|
840 | @type str |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
841 | @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
|
842 | @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
|
843 | """ |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
844 | errMsg = "" |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
845 | |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
846 | args = self.vcs.initCommand("tags") |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
847 | |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
848 | output = "" |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
849 | if self.__hgClient: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
850 | output, errMsg = self.__hgClient.runcommand(args) |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
851 | else: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
852 | process = QProcess() |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
853 | process.setWorkingDirectory(self.repodir) |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
854 | process.start('hg', args) |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
855 | procStarted = process.waitForStarted(5000) |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
856 | if procStarted: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
857 | finished = process.waitForFinished(30000) |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
858 | if finished and process.exitCode() == 0: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
859 | output = str(process.readAllStandardOutput(), |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
860 | self.vcs.getEncoding(), 'replace') |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
861 | else: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
862 | if not finished: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
863 | errMsg = self.tr( |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
864 | "The hg process did not finish within 30s.") |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
865 | else: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
866 | errMsg = self.tr("Could not start the hg executable.") |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
867 | |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
868 | if errMsg: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
869 | E5MessageBox.critical( |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
870 | self, |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
871 | self.tr("Mercurial Error"), |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
872 | errMsg) |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
873 | |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
874 | res = ("", "") |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
875 | if output: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
876 | 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
|
877 | if line.strip(): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
878 | try: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
879 | 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
|
880 | if name == tag: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
881 | 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
|
882 | break |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
883 | except ValueError: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
884 | # ignore silently |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
885 | pass |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
886 | |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
887 | return res |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
888 | |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
889 | def __generateLogItem(self, author, date, message, revision, changedPaths, |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
890 | parents, branches, tags, phase, bookmarks, |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
891 | latestTag): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
892 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
893 | Private method to generate a log tree entry. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
894 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
895 | @param author author info (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
896 | @param date date info (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
897 | @param message text of the log message (list of strings) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
898 | @param revision revision info (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
899 | @param changedPaths list of dictionary objects containing |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
900 | info about the changed files/directories |
179
09260f69bf37
Included parents info in log browser items.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
901 | @param parents list of parent revisions (list of integers) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
902 | @param branches list of branches (list of strings) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
903 | @param tags list of tags (string) |
2444
0fdd7f9ebd0b
Fixed a source docu and regenerated them.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
904 | @param phase phase of the entry (string) |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
905 | @param bookmarks list of bookmarks (string) |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
906 | @param latestTag the latest tag(s) reachable from the changeset |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
907 | (list of strings) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
908 | @return reference to the generated item (QTreeWidgetItem) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
909 | """ |
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
|
910 | logMessageColumnWidth = self.vcs.getPlugin().getPreferences( |
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
|
911 | "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
|
912 | msgtxt = "" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
913 | 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
|
914 | 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
|
915 | 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
|
916 | 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
|
917 | 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
|
918 | 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
|
919 | 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
|
920 | msgtxt = "{0}...".format(msgtxt[:logMessageColumnWidth]) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
921 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
922 | rev, node = revision.split(":") |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
923 | if rev in self.__closedBranchesRevs: |
3554
9ca56a89aec5
A liitle enhancement and a fix to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
924 | closedStr = self.ClosedIndicator |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
925 | else: |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
926 | closedStr = "" |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
927 | if phase in self.phases: |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
928 | phaseStr = self.phases[phase] |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
929 | else: |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
930 | phaseStr = phase |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
931 | 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
|
932 | "", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
933 | 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
|
934 | "{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
|
935 | 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
|
936 | author, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
937 | date, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
938 | msgtxt, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
939 | ", ".join(tags), |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
940 | ] |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
941 | if bookmarks is not None: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
942 | columnLabels.append(", ".join(bookmarks)) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
943 | itm = QTreeWidgetItem(self.logTree, columnLabels) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
944 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
945 | itm.setForeground(self.BranchColumn, |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
946 | QBrush(QColor(self.__branchColor(branches[0])))) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
947 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
948 | if not self.projectMode: |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
949 | 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
|
950 | if not parents: |
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
951 | parents = [int(rev) - 1] |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
952 | column, color, edges = self.__generateEdges(int(rev), parents) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
953 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
954 | itm.setData(0, self.__messageRole, message) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
955 | 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
|
956 | 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
|
957 | 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
|
958 | 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
|
959 | 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
|
960 | 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
|
961 | 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
|
962 | 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
|
963 | self.__childrenInfo[parent].append(int(rev)) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
964 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
965 | if self.logTree.topLevelItemCount() > 1: |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
966 | topedges = \ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
967 | self.logTree.topLevelItem( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
968 | self.logTree.indexOfTopLevelItem(itm) - 1)\ |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
969 | .data(0, self.__edgesRole) |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
970 | else: |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
971 | topedges = None |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
972 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
973 | icon = self.__generateIcon(column, color, edges, topedges, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
974 | QColor(self.__branchColor(branches[0])), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
975 | rev == self.__projectRevision, |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
976 | rev in self.__closedBranchesRevs) |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
977 | itm.setIcon(0, icon) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
978 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
979 | try: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
980 | self.__lastRev = int(revision.split(":")[0]) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
981 | except ValueError: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
982 | self.__lastRev = 0 |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
983 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
984 | return itm |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
985 | |
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
|
986 | 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
|
987 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
988 | Private method to retrieve log entries from the repository. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
989 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
990 | @param startRev revision number to start from (integer, string) |
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
|
991 | @keyparam noEntries number of entries to get (0 = default) (int) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
992 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
993 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
994 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
995 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
996 | QApplication.processEvents() |
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 | QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
999 | QApplication.processEvents() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1000 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1001 | self.buf = [] |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1002 | self.cancelled = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1003 | self.errors.clear() |
1269
7b4d9f1d7c6c
Fixed an issue in the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1265
diff
changeset
|
1004 | self.intercept = False |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1005 | |
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
|
1006 | if noEntries == 0: |
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
|
1007 | noEntries = self.limitSpinBox.value() |
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
|
1008 | |
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
|
1009 | preargs = [] |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
1010 | args = self.vcs.initCommand(self.commandMode) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1011 | args.append('--verbose') |
779
04c3a6026543
Fixed an issue where long incoming patchsets were not shown completely.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1012 | if self.commandMode not in ("incoming", "outgoing"): |
04c3a6026543
Fixed an issue where long incoming patchsets were not shown completely.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
1013 | args.append('--limit') |
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
|
1014 | args.append(str(noEntries)) |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1015 | if self.commandMode in ("incoming", "outgoing"): |
181
4af57f97c1bc
Added code to choose the way incoming and outgoing logs are shown.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1016 | args.append("--newest-first") |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1637
diff
changeset
|
1017 | if self.vcs.hasSubrepositories(): |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1637
diff
changeset
|
1018 | args.append("--subrepos") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1019 | if startRev is not None: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1020 | args.append('--rev') |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1021 | args.append('{0}:0'.format(startRev)) |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1022 | if not self.projectMode and \ |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1023 | not self.fname == "." and \ |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1024 | not self.stopCheckBox.isChecked(): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1025 | args.append('--follow') |
204
61552f56788a
Fixed an issue introduced by the last change to Mercurial log browser and dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
1026 | if self.commandMode == "log": |
61552f56788a
Fixed an issue introduced by the last change to Mercurial log browser and dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
1027 | args.append('--copies') |
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
|
1028 | args.append('--template') |
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
|
1029 | args.append(os.path.join(os.path.dirname(__file__), |
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
|
1030 | "templates", |
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
|
1031 | "logBrowserBookmarkPhase.tmpl")) |
215
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
1032 | 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
|
1033 | if 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
|
1034 | args.append(self.__bundle) |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1637
diff
changeset
|
1035 | elif not self.vcs.hasSubrepositories(): |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
1036 | project = e5App().getObject("Project") |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
1037 | self.vcs.bundleFile = os.path.join( |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
1038 | project.getProjectManagementDir(), "hg-bundle.hg") |
3242
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1039 | if os.path.exists(self.vcs.bundleFile): |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1040 | os.remove(self.vcs.bundleFile) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1041 | preargs = args[:] |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1042 | preargs.append("--quiet") |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1043 | preargs.append('--bundle') |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1044 | preargs.append(self.vcs.bundleFile) |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
1045 | args.append(self.vcs.bundleFile) |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1046 | 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
|
1047 | args.append(self.__filename) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1048 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1049 | if self.__hgClient: |
1242
dfb9609caf51
Continued implementing an interface to the Mercurial command server. Modified client all all dialogs done so far to provide a cancel capability..
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1241
diff
changeset
|
1050 | self.inputGroup.setEnabled(False) |
dfb9609caf51
Continued implementing an interface to the Mercurial command server. Modified client all all dialogs done so far to provide a cancel capability..
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1241
diff
changeset
|
1051 | self.inputGroup.hide() |
dfb9609caf51
Continued implementing an interface to the Mercurial command server. Modified client all all dialogs done so far to provide a cancel capability..
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1241
diff
changeset
|
1052 | |
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
|
1053 | if preargs: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1054 | out, err = self.__hgClient.runcommand(preargs) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1055 | 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
|
1056 | err = "" |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1057 | if err: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1058 | self.__showError(err) |
3249
8f22bfa586b1
Another fix for the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3247
diff
changeset
|
1059 | elif self.commandMode != "incoming" or \ |
3265
972d6be9dde7
Fixed issues in the Mercurial interface handling bundle files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3255
diff
changeset
|
1060 | (self.vcs.bundleFile and |
3268
8bfa66a9138a
Fixed issues in the Mercurial interface handling bundle files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3265
diff
changeset
|
1061 | os.path.exists(self.vcs.bundleFile)) or \ |
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
|
1062 | self.__bundle: |
3242
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1063 | out, err = self.__hgClient.runcommand(args) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1064 | self.buf = out.splitlines(True) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1065 | if err: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1066 | self.__showError(err) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1067 | self.__processBuffer() |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1068 | self.__finish() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1069 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1070 | self.process.kill() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1071 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1072 | self.process.setWorkingDirectory(self.repodir) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1073 | |
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
|
1074 | if preargs: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1075 | process = QProcess() |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1076 | process.setWorkingDirectory(self.repodir) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1077 | process.start('hg', args) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1078 | procStarted = process.waitForStarted(5000) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1079 | if procStarted: |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1080 | process.waitForFinished(30000) |
a7e006073658
Fixed an issue in Mercurial log dialogs showing a wrong diff for incoming changesets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1081 | |
3330
955e15f0ecce
Fixed an issue in the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3317
diff
changeset
|
1082 | if self.commandMode != "incoming" or \ |
3359
6b6c224d67d6
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3330
diff
changeset
|
1083 | (self.vcs.bundleFile and |
3330
955e15f0ecce
Fixed an issue in the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3317
diff
changeset
|
1084 | os.path.exists(self.vcs.bundleFile)) or \ |
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
|
1085 | self.__bundle: |
3247
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1086 | self.process.start('hg', args) |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1087 | procStarted = self.process.waitForStarted(5000) |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1088 | if not procStarted: |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1089 | self.inputGroup.setEnabled(False) |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1090 | self.inputGroup.hide() |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1091 | E5MessageBox.critical( |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1092 | self, |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1093 | self.tr('Process Generation Error'), |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1094 | self.tr( |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1095 | 'The process {0} could not be started. ' |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1096 | 'Ensure, that it is in the search path.' |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1097 | ).format('hg')) |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1098 | else: |
ed79e48ba0b4
Fix for the Mercurial log dialogs for checking incoming changes when there are none.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3243
diff
changeset
|
1099 | self.__finish() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1100 | |
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
|
1101 | def start(self, fn, bundle=None, isFile=False, noEntries=0): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1102 | """ |
198
7ab8e126f404
Fixed a few issues with the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1103 | Public slot to start the hg log command. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1104 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1105 | @param fn filename to show the log for (string) |
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
|
1106 | @keyparam bundle name of a bundle file (string) |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
1107 | @keyparam isFile flag indicating log for a file is to be shown |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
1108 | (boolean) |
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
|
1109 | @keyparam noEntries number of entries to get (0 = default) (int) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1110 | """ |
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
|
1111 | 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
|
1112 | self.__isFile = isFile |
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
|
1113 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1114 | self.sbsSelectLabel.clear() |
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
|
1115 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1116 | self.errorGroup.hide() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1117 | QApplication.processEvents() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1118 | |
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
|
1119 | self.__initData() |
2079b76a738b
Changed the Mercurial Log Browser dialog to maintain its position after being closed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3279
diff
changeset
|
1120 | |
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
|
1121 | self.__filename = fn |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1122 | self.dname, self.fname = self.vcs.splitPath(fn) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1123 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1124 | # find the root of the repo |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1125 | self.repodir = self.dname |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1126 | while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1127 | self.repodir = os.path.dirname(self.repodir) |
1324
370e8b9cfc23
Fixed an issue introduced by the last fix.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1319
diff
changeset
|
1128 | if os.path.splitdrive(self.repodir)[1] == os.sep: |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1129 | return |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1130 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1131 | self.projectMode = (self.fname == "." and self.dname == self.repodir) |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1132 | self.stopCheckBox.setDisabled(self.projectMode or self.fname == ".") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1133 | self.activateWindow() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1134 | self.raise_() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1135 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1136 | self.logTree.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1137 | self.__started = True |
243
a1d982e68edf
Fixed an issue introduced by the latest change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
241
diff
changeset
|
1138 | self.__identifyProject() |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
1139 | self.__getClosedBranches() |
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
|
1140 | self.__getLogEntries(noEntries=noEntries) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1141 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1142 | def __procFinished(self, exitCode, exitStatus): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1143 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1144 | Private slot connected to the finished signal. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1145 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1146 | @param exitCode exit code of the process (integer) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1147 | @param exitStatus exit status of the process (QProcess.ExitStatus) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1148 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1149 | self.__processBuffer() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1150 | self.__finish() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1151 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1152 | def __finish(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1153 | """ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1154 | 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
|
1155 | the button. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1156 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1157 | if self.process is not None and \ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1158 | self.process.state() != QProcess.NotRunning: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1159 | self.process.terminate() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1160 | QTimer.singleShot(2000, self.process.kill) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1161 | self.process.waitForFinished(3000) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1162 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1163 | QApplication.restoreOverrideCursor() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1164 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1165 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1166 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1167 | self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1168 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1169 | self.inputGroup.setEnabled(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1170 | self.inputGroup.hide() |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1171 | self.refreshButton.setEnabled(True) |
5450
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
1172 | |
a5d5e757efcf
Fixed a bug in the log browser dialogs causing an endless loop.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5449
diff
changeset
|
1173 | 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
|
1174 | self.__finishCallbacks.pop(0)() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1175 | |
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
|
1176 | 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
|
1177 | """ |
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
|
1178 | Private method to convert the displayed file name for a large file. |
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
|
1179 | |
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
|
1180 | @param filename file name to be processed (string) |
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
|
1181 | @return processed file name (string) |
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
|
1182 | """ |
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
|
1183 | 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
|
1184 | return self.tr("{0} (large file)").format( |
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
|
1185 | self.PathSeparatorRe.split(filename, 1)[1]) |
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
|
1186 | 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
|
1187 | return 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
|
1188 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1189 | def __processBuffer(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1190 | """ |
198
7ab8e126f404
Fixed a few issues with the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1191 | 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
|
1192 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1193 | noEntries = 0 |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
1194 | log = {"message": [], "bookmarks": None, "phase": ""} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1195 | 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
|
1196 | initialText = True |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1197 | fileCopies = {} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1198 | for s in self.buf: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1199 | if s != "@@@\n": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1200 | try: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1201 | key, value = s.split("|", 1) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1202 | except ValueError: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1203 | key = "" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1204 | value = s |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1205 | 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
|
1206 | initialText = False |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1207 | log["revision"] = value.strip() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1208 | elif key == "user": |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1209 | log["author"] = value.strip() |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1210 | elif key == "parents": |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1211 | log["parents"] = \ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1212 | [int(x.split(":", 1)[0]) |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1213 | for x in value.strip().split()] |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1214 | elif key == "date": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1215 | log["date"] = " ".join(value.strip().split()[:2]) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1216 | elif key == "description": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1217 | log["message"].append(value.strip()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1218 | elif key == "file_adds": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1219 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1220 | 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
|
1221 | if f in fileCopies: |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1222 | changedPaths.append({ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1223 | "action": "A", |
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
|
1224 | "path": self.__modifyForLargeFiles(f), |
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
|
1225 | "copyfrom": self.__modifyForLargeFiles( |
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
|
1226 | fileCopies[f]), |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1227 | }) |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1228 | else: |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1229 | changedPaths.append({ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1230 | "action": "A", |
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
|
1231 | "path": self.__modifyForLargeFiles(f), |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1232 | "copyfrom": "", |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1233 | }) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1234 | elif key == "files_mods": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1235 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1236 | 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
|
1237 | changedPaths.append({ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1238 | "action": "M", |
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
|
1239 | "path": self.__modifyForLargeFiles(f), |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1240 | "copyfrom": "", |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1241 | }) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1242 | elif key == "file_dels": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1243 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1244 | 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
|
1245 | changedPaths.append({ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1246 | "action": "D", |
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
|
1247 | "path": self.__modifyForLargeFiles(f), |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1248 | "copyfrom": "", |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1249 | }) |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1250 | elif key == "file_copies": |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1251 | if value.strip(): |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1252 | 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
|
1253 | newName, oldName = entry[:-1].split(" (") |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1254 | fileCopies[newName] = oldName |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1255 | elif key == "branches": |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1256 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1257 | log["branches"] = value.strip().split(", ") |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1258 | else: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1259 | log["branches"] = ["default"] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1260 | elif key == "tags": |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1261 | log["tags"] = value.strip().split(", ") |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1262 | elif key == "bookmarks": |
1019
d8a9697f78d1
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
1263 | 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
|
1264 | elif key == "phase": |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
1265 | 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
|
1266 | elif key == "latesttag": |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1267 | tag = value.strip() |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1268 | if tag == "null": |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1269 | log["latesttag"] = [] |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1270 | elif ":" in tag: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1271 | log["latesttag"] = [ |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1272 | t.strip() for t in tag.split(":") if t.strip()] |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1273 | else: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1274 | log["latesttag"] = [tag] |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1275 | 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
|
1276 | 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
|
1277 | continue |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1278 | if value.strip(): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1279 | log["message"].append(value.strip()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1280 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1281 | if len(log) > 1: |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
1282 | self.__generateLogItem( |
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
1283 | log["author"], log["date"], |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1284 | log["message"], log["revision"], changedPaths, |
1061
3e21869872e3
Fixed PEP-8 related issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1019
diff
changeset
|
1285 | log["parents"], log["branches"], log["tags"], |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1286 | log["phase"], log["bookmarks"], log["latesttag"]) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1287 | dt = QDate.fromString(log["date"], Qt.ISODate) |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1288 | if not self.__maxDate.isValid() and \ |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1289 | not self.__minDate.isValid(): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1290 | self.__maxDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1291 | self.__minDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1292 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1293 | if self.__maxDate < dt: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1294 | self.__maxDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1295 | if self.__minDate > dt: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1296 | self.__minDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1297 | noEntries += 1 |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
1298 | log = {"message": [], "bookmarks": None, "phase": ""} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1299 | changedPaths = [] |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
1300 | fileCopies = {} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1301 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1302 | self.__resizeColumnsLog() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1303 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1304 | if self.__started: |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1305 | if self.__selectedRevisions: |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1306 | foundItems = self.logTree.findItems( |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1307 | self.__selectedRevisions[0], Qt.MatchExactly, |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1308 | self.RevisionColumn) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1309 | if foundItems: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1310 | self.logTree.setCurrentItem(foundItems[0]) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1311 | else: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1312 | self.logTree.setCurrentItem(self.logTree.topLevelItem(0)) |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1313 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1314 | self.logTree.setCurrentItem(self.logTree.topLevelItem(0)) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1315 | self.__started = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1316 | |
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
|
1317 | if self.commandMode in ("incoming", "outgoing"): |
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
|
1318 | self.commandMode = "log" # switch to log mode |
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
|
1319 | 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
|
1320 | 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
|
1321 | 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
|
1322 | 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
|
1323 | 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
|
1324 | 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
|
1325 | self.limitSpinBox.setEnabled(False) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1326 | |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1327 | # update the log filters |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1328 | self.__filterLogsEnabled = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1329 | self.fromDate.setMinimumDate(self.__minDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1330 | self.fromDate.setMaximumDate(self.__maxDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1331 | self.fromDate.setDate(self.__minDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1332 | self.toDate.setMinimumDate(self.__minDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1333 | self.toDate.setMaximumDate(self.__maxDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1334 | self.toDate.setDate(self.__maxDate) |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1335 | |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1336 | branchFilter = self.branchCombo.currentText() |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1337 | if not branchFilter: |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1338 | branchFilter = self.__allBranchesFilter |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1339 | self.branchCombo.clear() |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1340 | self.branchCombo.addItems( |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1341 | [self.__allBranchesFilter] + sorted(self.__branchColors.keys())) |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1342 | self.branchCombo.setCurrentIndex( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1343 | self.branchCombo.findText(branchFilter)) |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1344 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1345 | 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
|
1346 | if self.__actionMode() == "filter": |
4080
d4ba5fab5557
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4060
diff
changeset
|
1347 | 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
|
1348 | self.__updateToolMenuActions() |
3927
3e1dc0fb26ed
Enhanced the Mercurial log browser a little bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3909
diff
changeset
|
1349 | |
3e1dc0fb26ed
Enhanced the Mercurial log browser a little bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3909
diff
changeset
|
1350 | # restore current item |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1351 | if self.__selectedRevisions: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1352 | 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
|
1353 | items = self.logTree.findItems( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1354 | revision, Qt.MatchExactly, self.RevisionColumn) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1355 | if items: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1356 | 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
|
1357 | self.__selectedRevisions = [] |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1358 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1359 | def __readStdout(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1360 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1361 | Private slot to handle the readyReadStandardOutput signal. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1362 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1363 | It reads the output of the process and inserts it into a buffer. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1364 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1365 | self.process.setReadChannel(QProcess.StandardOutput) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1366 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1367 | while self.process.canReadLine(): |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
1368 | line = str(self.process.readLine(), self.vcs.getEncoding(), |
3036
30c81c9e88b8
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3034
diff
changeset
|
1369 | 'replace') |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1370 | self.buf.append(line) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1371 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1372 | def __readStderr(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1373 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1374 | Private slot to handle the readyReadStandardError signal. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1375 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1376 | It reads the error output of the process and inserts it into the |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1377 | error pane. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1378 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1379 | if self.process is not None: |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1380 | s = str(self.process.readAllStandardError(), |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3287
diff
changeset
|
1381 | self.vcs.getEncoding(), 'replace') |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1382 | self.__showError(s) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1383 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1384 | def __showError(self, out): |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1385 | """ |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1386 | Private slot to show some error. |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1387 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1388 | @param out error to be shown (string) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1389 | """ |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1390 | self.errorGroup.show() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1391 | self.errors.insertPlainText(out) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
1392 | self.errors.ensureCursorVisible() |
5463
d84b854d59c0
Changed the status and log browser dialogs to show the input widgets only when something was written to stderr in order to get less flicker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5459
diff
changeset
|
1393 | |
d84b854d59c0
Changed the status and log browser dialogs to show the input widgets only when something was written to stderr in order to get less flicker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5459
diff
changeset
|
1394 | if not self.__hgClient: |
d84b854d59c0
Changed the status and log browser dialogs to show the input widgets only when something was written to stderr in order to get less flicker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5459
diff
changeset
|
1395 | # show input in case the process asked for some input |
d84b854d59c0
Changed the status and log browser dialogs to show the input widgets only when something was written to stderr in order to get less flicker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5459
diff
changeset
|
1396 | self.inputGroup.setEnabled(True) |
d84b854d59c0
Changed the status and log browser dialogs to show the input widgets only when something was written to stderr in order to get less flicker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5459
diff
changeset
|
1397 | self.inputGroup.show() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1398 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1399 | def on_buttonBox_clicked(self, button): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1400 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1401 | Private slot called by a button of the button box clicked. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1402 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1403 | @param button button that was clicked (QAbstractButton) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1404 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1405 | if button == self.buttonBox.button(QDialogButtonBox.Close): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1406 | self.close() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1407 | elif button == self.buttonBox.button(QDialogButtonBox.Cancel): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1408 | self.cancelled = True |
1242
dfb9609caf51
Continued implementing an interface to the Mercurial command server. Modified client all all dialogs done so far to provide a cancel capability..
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1241
diff
changeset
|
1409 | if self.__hgClient: |
dfb9609caf51
Continued implementing an interface to the Mercurial command server. Modified client all all dialogs done so far to provide a cancel capability..
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1241
diff
changeset
|
1410 | self.__hgClient.cancel() |
dfb9609caf51
Continued implementing an interface to the Mercurial command server. Modified client all all dialogs done so far to provide a cancel capability..
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1241
diff
changeset
|
1411 | else: |
dfb9609caf51
Continued implementing an interface to the Mercurial command server. Modified client all all dialogs done so far to provide a cancel capability..
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1241
diff
changeset
|
1412 | self.__finish() |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1413 | elif button == self.refreshButton: |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1414 | self.on_refreshButton_clicked() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1415 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1416 | def __updateSbsSelectLabel(self): |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1417 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1418 | 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
|
1419 | """ |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1420 | self.sbsSelectLabel.clear() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1421 | if self.__isFile: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1422 | 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
|
1423 | 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
|
1424 | currentItem = selectedItems[0] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1425 | 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
|
1426 | .strip() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1427 | 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
|
1428 | if parents: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1429 | parentLinks = [] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1430 | 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
|
1431 | parentLinks.append( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1432 | '<a href="sbsdiff:{0}_{1}"> {2} </a>' |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1433 | .format(parents[index], rev2, index + 1)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1434 | self.sbsSelectLabel.setText( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1435 | self.tr('Side-by-Side Diff to Parent {0}').format( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1436 | " ".join(parentLinks))) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1437 | 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
|
1438 | rev1 = int(selectedItems[0].text(self.RevisionColumn) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1439 | .split(":", 1)[0]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1440 | rev2 = int(selectedItems[1].text(self.RevisionColumn) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1441 | .split(":", 1)[0]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1442 | if rev1 > rev2: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1443 | # 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
|
1444 | rev1, rev2 = rev2, rev1 |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1445 | self.sbsSelectLabel.setText(self.tr( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1446 | '<a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a>') |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1447 | .format(rev1, rev2)) |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1448 | |
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
|
1449 | 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
|
1450 | """ |
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
|
1451 | 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
|
1452 | 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
|
1453 | """ |
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
|
1454 | if self.initialCommandMode == "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
|
1455 | # 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
|
1456 | # 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
|
1457 | 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
|
1458 | 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
|
1459 | public = 0 |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1460 | for itm in self.logTree.selectedItems(): |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1461 | 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
|
1462 | 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
|
1463 | 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
|
1464 | 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
|
1465 | 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
|
1466 | 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
|
1467 | public += 1 |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1468 | |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1469 | # step 2: set the status of 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
|
1470 | if public == 0 and \ |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1471 | ((secret > 0 and draft == 0) or |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1472 | (secret == 0 and 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
|
1473 | 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
|
1474 | else: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1475 | self.__phaseAct.setEnabled(False) |
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
|
1476 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1477 | # 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
|
1478 | # 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
|
1479 | # 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
|
1480 | otherBranches = 0 |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1481 | for itm in self.logTree.selectedItems(): |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1482 | 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
|
1483 | 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
|
1484 | otherBranches += 1 |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1485 | |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1486 | # 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
|
1487 | self.__graftAct.setEnabled(otherBranches > 0) |
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
|
1488 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1489 | selectedItemsCount = len(self.logTree.selectedItems()) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1490 | 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
|
1491 | 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
|
1492 | 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
|
1493 | 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
|
1494 | self.__bookmarkMoveAct.setEnabled(selectedItemsCount == 1) |
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
|
1495 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1496 | self.__pullAct.setText(self.tr("Pull Changes")) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1497 | self.__fetchAct.setText(self.tr("Fetch Changes")) |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1498 | if self.vcs.canPull(): |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1499 | self.__pullAct.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
|
1500 | self.__lfPullAct.setEnabled( |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1501 | self.vcs.isExtensionActive("largefiles") and |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1502 | selectedItemsCount > 0) |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1503 | self.__fetchAct.setEnabled( |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1504 | self.vcs.isExtensionActive("fetch")) |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1505 | else: |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1506 | 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
|
1507 | self.__lfPullAct.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
|
1508 | self.__fetchAct.setEnabled(False) |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
1509 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1510 | 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
|
1511 | self.__pushAct.setEnabled( |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1512 | selectedItemsCount == 1 and |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1513 | self.logTree.selectedItems()[0].text(self.PhaseColumn) == |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1514 | self.phases["draft"]) |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1515 | 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
|
1516 | else: |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1517 | 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
|
1518 | self.__pushAllAct.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
|
1519 | |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1520 | self.__stripAct.setEnabled( |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
1521 | self.vcs.isExtensionActive("strip") and |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1522 | selectedItemsCount == 1) |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
1523 | |
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
|
1524 | self.__bundleAct.setEnabled(self.logTree.topLevelItemCount() > 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
|
1525 | self.__unbundleAct.setEnabled(False) |
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
|
1526 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1527 | self.__gpgSignAct.setEnabled( |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1528 | self.vcs.isExtensionActive("gpg") and |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1529 | selectedItemsCount > 0) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1530 | self.__gpgVerifyAct.setEnabled( |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1531 | self.vcs.isExtensionActive("gpg") and |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1532 | selectedItemsCount == 1) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
1533 | |
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
|
1534 | self.actionsButton.setEnabled(True) |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1535 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1536 | elif self.initialCommandMode == "incoming" and self.projectMode: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1537 | for act in [self.__phaseAct, self.__graftAct, self.__mergeAct, |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1538 | self.__tagAct, self.__switchAct, self.__bookmarkAct, |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1539 | self.__bookmarkMoveAct, self.__pushAct, |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1540 | self.__pushAllAct, self.__stripAct, self.__bundleAct, |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1541 | self.__gpgSignAct, self.__gpgVerifyAct]: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1542 | act.setEnabled(False) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1543 | |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1544 | self.__pullAct.setText(self.tr("Pull Selected Changes")) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1545 | self.__fetchAct.setText(self.tr("Fetch Selected Changes")) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1546 | if self.vcs.canPull(): |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1547 | # step 1: determine number of selected draft changesets |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1548 | # i.e. those that can be pulled |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1549 | selectedDraftItemsCount = 0 |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1550 | for itm in self.logTree.selectedItems(): |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1551 | 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
|
1552 | 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
|
1553 | selectedDraftItemsCount += 1 |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1554 | self.__pullAct.setEnabled(selectedDraftItemsCount > 0) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1555 | self.__lfPullAct.setEnabled( |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1556 | self.vcs.isExtensionActive("largefiles") and |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1557 | selectedItemsCount > 0) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1558 | self.__fetchAct.setEnabled( |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1559 | self.vcs.isExtensionActive("fetch") and |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1560 | selectedDraftItemsCount > 0) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1561 | else: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1562 | self.__pullAct.setEnabled(False) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1563 | self.__lfPullAct.setEnabled(False) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1564 | self.__fetchAct.setEnabled(False) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1565 | |
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
|
1566 | self.__unbundleAct.setEnabled(bool(self.__bundle)) |
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
|
1567 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
1568 | self.actionsButton.setEnabled(True) |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1569 | |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1570 | elif self.initialCommandMode == "outgoing" and self.projectMode: |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1571 | for act in [self.__phaseAct, self.__graftAct, self.__mergeAct, |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1572 | self.__tagAct, self.__switchAct, self.__bookmarkAct, |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1573 | self.__bookmarkMoveAct, self.__pullAct, |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1574 | self.__lfPullAct, self.__fetchAct, self.__stripAct, |
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
|
1575 | self.__gpgSignAct, self.__gpgVerifyAct, |
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
|
1576 | self.__unbundleAct]: |
5513
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1577 | act.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
|
1578 | |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1579 | 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
|
1580 | 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
|
1581 | self.__pushAct.setEnabled( |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1582 | selectedItemsCount == 1 and |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1583 | self.logTree.selectedItems()[0].text(self.PhaseColumn) == |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1584 | self.phases["draft"]) |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1585 | 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
|
1586 | else: |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1587 | 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
|
1588 | self.__pushAllAct.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
|
1589 | |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1590 | self.__bundleAct.setEnabled(selectedItemsCount > 0) |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
1591 | |
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
|
1592 | 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
|
1593 | self.actionsButton.setEnabled(False) |
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
|
1594 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1595 | 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
|
1596 | """ |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1597 | 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
|
1598 | """ |
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
|
1599 | 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
|
1600 | 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
|
1601 | self.__diffUpdatesFiles = False |
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
|
1602 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1603 | 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
|
1604 | 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
|
1605 | self.detailsEdit.setHtml( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1606 | 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
|
1607 | 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
|
1608 | self.__resizeColumnsFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1609 | self.__resortFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1610 | 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
|
1611 | self.__diffUpdatesFiles = True |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1612 | 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
|
1613 | 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
|
1614 | if index1 > index2: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1615 | # Swap the entries |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1616 | selectedItems[0], selectedItems[1] = \ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1617 | selectedItems[1], selectedItems[0] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1618 | 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
|
1619 | 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
|
1620 | 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
|
1621 | ) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1622 | 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
|
1623 | # self.filesTree is updated by the diff |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1624 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1625 | 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
|
1626 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1627 | 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
|
1628 | changeset. |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1629 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1630 | @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
|
1631 | @type QTreeWidgetItem |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1632 | @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
|
1633 | @rtype str |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1634 | """ |
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
|
1635 | 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
|
1636 | 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
|
1637 | 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
|
1638 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1639 | tagsStr = "" |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1640 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1641 | 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
|
1642 | bookmarksStr = self.__bookmarksTemplate.format( |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1643 | 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
|
1644 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1645 | bookmarksStr = "" |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1646 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1647 | 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
|
1648 | latestTagLinks = [] |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1649 | for tag in itm.data(0, self.__latestTagRole): |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1650 | latestTagLinks.append('<a href="rev:{0}">{1}</a>'.format( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1651 | self.__getRevisionOfTag(tag)[0], tag)) |
5459
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1652 | latestTagStr = self.__latestTagTemplate.format( |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1653 | ", ".join(latestTagLinks)) |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1654 | else: |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1655 | latestTagStr = "" |
cdfdecd2faef
Extended the details view of the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5451
diff
changeset
|
1656 | |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
1657 | rev = int(itm.text(self.RevisionColumn).split(":", 1)[0]) |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
1658 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1659 | 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
|
1660 | parentLinks = [] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1661 | for parent in [str(x) for x in |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1662 | 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
|
1663 | parentLinks.append( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1664 | '<a href="rev:{0}">{0}</a>'.format(parent)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1665 | parentsStr = self.__parentsTemplate.format( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1666 | ", ".join(parentLinks)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1667 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1668 | parentsStr = "" |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
1669 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1670 | 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
|
1671 | childLinks = [] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1672 | for child in [str(x) for x in self.__childrenInfo[rev]]: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1673 | childLinks.append( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1674 | '<a href="rev:{0}">{0}</a>'.format(child)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1675 | childrenStr = self.__childrenTemplate.format( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1676 | ", ".join(childLinks)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1677 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1678 | childrenStr = "" |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
1679 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1680 | messageStr = "<br />\n".join([ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1681 | line.strip() for line in itm.data(0, self.__messageRole) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1682 | ]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1683 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1684 | 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
|
1685 | 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
|
1686 | 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
|
1687 | itm.text(self.AuthorColumn), |
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
|
1688 | itm.text(self.BranchColumn).replace( |
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
|
1689 | self.ClosedIndicator, ""), |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1690 | parentsStr + childrenStr + tagsStr + latestTagStr + |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1691 | bookmarksStr, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1692 | messageStr, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1693 | ) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1694 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1695 | html = "" |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1696 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1697 | return html |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1698 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1699 | 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
|
1700 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1701 | Private method to update the files tree with changes of the given item. |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1702 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1703 | @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
|
1704 | @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
|
1705 | @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
|
1706 | @type QTreeWidgetItem |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1707 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1708 | 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
|
1709 | 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
|
1710 | 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
|
1711 | for change in changes: |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1712 | QTreeWidgetItem(parent, [ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1713 | self.flags[change["action"]], |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1714 | change["path"].strip(), |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1715 | change["copyfrom"].strip(), |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1716 | ]) |
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
|
1717 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1718 | @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1719 | def on_logTree_currentItemChanged(self, current, previous): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1720 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1721 | Private slot called, when the current item of the log tree changes. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1722 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1723 | @param current reference to the new current item (QTreeWidgetItem) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1724 | @param previous reference to the old current item (QTreeWidgetItem) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1725 | """ |
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
|
1726 | self.__updateToolMenuActions() |
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
|
1727 | |
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
|
1728 | # 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
|
1729 | 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
|
1730 | 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
|
1731 | previous and previous.setFont(col, self.__logTreeNormalFont) |
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
|
1732 | |
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
|
1733 | # 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
|
1734 | self.upButton.setEnabled( |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1735 | current is not None and |
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
|
1736 | self.logTree.indexOfTopLevelItem(current) > 0) |
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
|
1737 | self.downButton.setEnabled( |
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
|
1738 | current is not None and |
5494
fdc53cc1e2fb
Fixed another issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5493
diff
changeset
|
1739 | int(current.text(self.RevisionColumn).split(":")[0]) > 0 and |
fdc53cc1e2fb
Fixed another issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5493
diff
changeset
|
1740 | (self.logTree.indexOfTopLevelItem(current) < |
5517
805b36a7ffb7
Fixed a few code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5514
diff
changeset
|
1741 | self.logTree.topLevelItemCount() - 1 or |
805b36a7ffb7
Fixed a few code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5514
diff
changeset
|
1742 | self.nextButton.isEnabled())) |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1743 | |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1744 | @pyqtSlot() |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1745 | def on_logTree_itemSelectionChanged(self): |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1746 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1747 | 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
|
1748 | """ |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1749 | self.__updateDetailsAndFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1750 | 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
|
1751 | self.__updateToolMenuActions() |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1752 | self.__generateDiffs() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1753 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1754 | @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
|
1755 | 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
|
1756 | """ |
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
|
1757 | 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
|
1758 | """ |
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
|
1759 | 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
|
1760 | 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
|
1761 | 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
|
1762 | |
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
|
1763 | @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
|
1764 | 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
|
1765 | """ |
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
|
1766 | 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
|
1767 | """ |
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
|
1768 | 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
|
1769 | 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
|
1770 | 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
|
1771 | 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
|
1772 | # 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
|
1773 | if self.nextButton.isEnabled(): |
5493
09cd66fa3243
Fixed an issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5490
diff
changeset
|
1774 | 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
|
1775 | self.on_nextButton_clicked() |
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
|
1776 | |
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
|
1777 | @pyqtSlot() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1778 | def on_nextButton_clicked(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1779 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1780 | Private slot to handle the Next button. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1781 | """ |
5490
95db14ec60b2
Added some code to cope with unlimited recursions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5489
diff
changeset
|
1782 | if self.__lastRev > 0 and self.nextButton.isEnabled(): |
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
|
1783 | self.__getLogEntries(startRev=self.__lastRev - 1) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1784 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1785 | @pyqtSlot(QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1786 | def on_fromDate_dateChanged(self, date): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1787 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1788 | Private slot called, when the from date changes. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1789 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1790 | @param date new date (QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1791 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1792 | 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
|
1793 | self.__filterLogs() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1794 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1795 | @pyqtSlot(QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1796 | def on_toDate_dateChanged(self, date): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1797 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1798 | Private slot called, when the from date changes. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1799 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1800 | @param date new date (QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1801 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1802 | 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
|
1803 | self.__filterLogs() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1804 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1805 | @pyqtSlot(str) |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1806 | def on_branchCombo_activated(self, txt): |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1807 | """ |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1808 | Private slot called, when a new branch is selected. |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1809 | |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1810 | @param txt text of the selected branch (string) |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1811 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1812 | 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
|
1813 | self.__filterLogs() |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1814 | |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1815 | @pyqtSlot(str) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1816 | def on_fieldCombo_activated(self, txt): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1817 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1818 | Private slot called, when a new filter field is selected. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1819 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1820 | @param txt text of the selected field (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1821 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1822 | 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
|
1823 | self.__filterLogs() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1824 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1825 | @pyqtSlot(str) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1826 | def on_rxEdit_textChanged(self, txt): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1827 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1828 | Private slot called, when a filter expression is entered. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1829 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1830 | @param txt filter expression (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1831 | """ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1832 | 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
|
1833 | self.__filterLogs() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1834 | 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
|
1835 | self.__findItem(self.__findBackwards, interactive=True) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1836 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1837 | @pyqtSlot() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1838 | 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
|
1839 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1840 | 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
|
1841 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1842 | 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
|
1843 | self.__findItem(self.__findBackwards, interactive=True) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1844 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1845 | def __filterLogs(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1846 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1847 | Private method to filter the log entries. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1848 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1849 | if self.__filterLogsEnabled: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1850 | 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
|
1851 | 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
|
1852 | branch = self.branchCombo.currentText() |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1853 | 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
|
1854 | fieldIndex, searchRx, indexIsRole = self.__prepareFieldSearch() |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1855 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1856 | visibleItemCount = self.logTree.topLevelItemCount() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1857 | currentItem = self.logTree.currentItem() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1858 | for topIndex in range(self.logTree.topLevelItemCount()): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1859 | 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
|
1860 | 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
|
1861 | 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
|
1862 | 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
|
1863 | txt = "\n".join( |
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
|
1864 | [c["path"] for c in changes] + |
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
|
1865 | [c["copyfrom"] for c in changes] |
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
|
1866 | ) |
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
|
1867 | 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
|
1868 | # 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
|
1869 | 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
|
1870 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1871 | txt = topItem.text(fieldIndex) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1872 | if topItem.text(self.DateColumn) <= to_ and \ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1873 | topItem.text(self.DateColumn) >= from_ and \ |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
1874 | (branch == self.__allBranchesFilter or |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
1875 | topItem.text(self.BranchColumn) in |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1876 | [branch, closedBranch]) and \ |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1877 | searchRx.indexIn(txt) > -1: |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1878 | topItem.setHidden(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1879 | if topItem is currentItem: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1880 | self.on_logTree_currentItemChanged(topItem, None) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1881 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1882 | topItem.setHidden(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1883 | if topItem is currentItem: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1884 | 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
|
1885 | visibleItemCount -= 1 |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1886 | self.logTree.header().setSectionHidden( |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1887 | self.IconColumn, |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1888 | visibleItemCount != self.logTree.topLevelItemCount()) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1889 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1890 | def __prepareFieldSearch(self): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1891 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1892 | Private slot to prepare the filed search data. |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1893 | |
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
|
1894 | @return tuple of field index, search expression and flag indicating |
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
|
1895 | that the field index is a data role (integer, string, boolean) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1896 | """ |
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
|
1897 | indexIsRole = False |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1898 | 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
|
1899 | if txt == "author": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1900 | fieldIndex = self.AuthorColumn |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1901 | searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1902 | elif txt == "revision": |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1903 | fieldIndex = self.RevisionColumn |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1904 | 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
|
1905 | if txt.startswith("^"): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1906 | searchRx = QRegExp("^\s*{0}".format(txt[1:]), |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1907 | Qt.CaseInsensitive) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1908 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1909 | searchRx = QRegExp(txt, Qt.CaseInsensitive) |
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
|
1910 | 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
|
1911 | fieldIndex = self.__changesRole |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1912 | searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) |
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
|
1913 | indexIsRole = True |
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
|
1914 | 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
|
1915 | fieldIndex = self.__messageRole |
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
|
1916 | searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) |
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
|
1917 | indexIsRole = True |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1918 | |
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
|
1919 | return fieldIndex, searchRx, indexIsRole |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1920 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1921 | @pyqtSlot(bool) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1922 | def on_stopCheckBox_clicked(self, checked): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1923 | """ |
2962
d6c9d1ca2da4
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
1924 | Private slot called, when the stop on copy/move checkbox is clicked. |
d6c9d1ca2da4
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
1925 | |
d6c9d1ca2da4
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2848
diff
changeset
|
1926 | @param checked flag indicating the state of the check box (boolean) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1927 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1928 | self.vcs.getPlugin().setPreferences("StopLogOnCopy", |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1929 | self.stopCheckBox.isChecked()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1930 | self.nextButton.setEnabled(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1931 | self.limitSpinBox.setEnabled(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1932 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1933 | @pyqtSlot() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1934 | def on_refreshButton_clicked(self): |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1935 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1936 | Private slot to refresh the log. |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1937 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1938 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1939 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1940 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1941 | |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1942 | self.refreshButton.setEnabled(False) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1943 | |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1944 | # 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
|
1945 | self.__selectedRevisions = [] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
1946 | 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
|
1947 | self.__selectedRevisions.append(item.text(self.RevisionColumn)) |
3927
3e1dc0fb26ed
Enhanced the Mercurial log browser a little bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3909
diff
changeset
|
1948 | |
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
|
1949 | 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
|
1950 | 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
|
1951 | self.limitSpinBox.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
|
1952 | 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
|
1953 | 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
|
1954 | self.limitSpinBox.setEnabled(True) |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1955 | |
1264
da42fd833a66
Fixed a little bug in the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1263
diff
changeset
|
1956 | self.commandMode = self.initialCommandMode |
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
|
1957 | self.start(self.__filename, isFile=self.__isFile, |
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
|
1958 | noEntries=self.logTree.topLevelItemCount()) |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1959 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1960 | def on_passwordCheckBox_toggled(self, isOn): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1961 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1962 | Private slot to handle the password checkbox toggled. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1963 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1964 | @param isOn flag indicating the status of the check box (boolean) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1965 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1966 | if isOn: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1967 | self.input.setEchoMode(QLineEdit.Password) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1968 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1969 | self.input.setEchoMode(QLineEdit.Normal) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1970 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1971 | @pyqtSlot() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1972 | def on_sendButton_clicked(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1973 | """ |
3909
354f4f62d507
Corrected some typos.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3715
diff
changeset
|
1974 | Private slot to send the input to the mercurial process. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1975 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1976 | input = self.input.text() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1977 | input += os.linesep |
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 | if self.passwordCheckBox.isChecked(): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1980 | self.errors.insertPlainText(os.linesep) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1981 | self.errors.ensureCursorVisible() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1982 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1983 | self.errors.insertPlainText(input) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1984 | self.errors.ensureCursorVisible() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1985 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1986 | self.process.write(input) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1987 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1988 | self.passwordCheckBox.setChecked(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1989 | self.input.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1990 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1991 | def on_input_returnPressed(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1992 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1993 | Private slot to handle the press of the return key in the input field. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1994 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1995 | self.intercept = True |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1996 | self.on_sendButton_clicked() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1997 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1998 | def keyPressEvent(self, evt): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1999 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2000 | Protected slot to handle a key press event. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2001 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2002 | @param evt the key press event (QKeyEvent) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2003 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2004 | if self.intercept: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2005 | self.intercept = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2006 | evt.accept() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2007 | return |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2444
diff
changeset
|
2008 | super(HgLogBrowserDialog, self).keyPressEvent(evt) |
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
|
2009 | |
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
|
2010 | @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
|
2011 | 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
|
2012 | """ |
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
|
2013 | 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
|
2014 | """ |
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
|
2015 | currentPhase = self.logTree.selectedItems()[0].text(self.PhaseColumn) |
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
|
2016 | revs = [] |
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
|
2017 | for itm in self.logTree.selectedItems(): |
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
|
2018 | if itm.text(self.PhaseColumn) == currentPhase: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
2019 | revs.append( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
2020 | itm.text(self.RevisionColumn).split(":")[0].strip()) |
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
|
2021 | |
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
|
2022 | if not revs: |
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
|
2023 | self.__phaseAct.setEnabled(False) |
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
|
2024 | return |
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
|
2025 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2026 | if currentPhase == self.phases["draft"]: |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2027 | newPhase = self.phases["secret"] |
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
|
2028 | data = (revs, "s", True) |
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
|
2029 | else: |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2030 | newPhase = self.phases["draft"] |
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
|
2031 | data = (revs, "d", False) |
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
|
2032 | res = self.vcs.hgPhase(self.repodir, data) |
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
|
2033 | if res: |
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
|
2034 | for itm in self.logTree.selectedItems(): |
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
|
2035 | itm.setText(self.PhaseColumn, newPhase) |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2036 | |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2037 | @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
|
2038 | 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
|
2039 | """ |
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
|
2040 | 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
|
2041 | """ |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2042 | revs = [] |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2043 | |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2044 | for itm in self.logTree.selectedItems(): |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2045 | 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
|
2046 | if branch != self.__projectBranch: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
2047 | revs.append( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
2048 | itm.text(self.RevisionColumn).strip().split(":", 1)[0]) |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2049 | |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2050 | if revs: |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2051 | shouldReopen = self.vcs.hgGraft(self.repodir, revs) |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2052 | if shouldReopen: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
2053 | res = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
2054 | None, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
2055 | self.tr("Copy Changesets"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3185
diff
changeset
|
2056 | self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
2057 | """The project should be reread. Do this now?"""), |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2058 | yesDefault=True) |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2059 | if res: |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
2060 | e5App().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
|
2061 | return |
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
|
2062 | |
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
|
2063 | self.on_refreshButton_clicked() |
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
|
2064 | |
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
|
2065 | @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
|
2066 | 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
|
2067 | """ |
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
|
2068 | 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
|
2069 | """ |
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
|
2070 | if len(self.logTree.selectedItems()) == 1: |
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
|
2071 | 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
|
2072 | 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
|
2073 | tag = itm.text(self.TagsColumn).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
|
2074 | res = self.vcs.vcsTag(self.repodir, revision=rev, tagName=tag) |
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
|
2075 | 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
|
2076 | self.on_refreshButton_clicked() |
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
|
2077 | |
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
|
2078 | @pyqtSlot() |
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
|
2079 | 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
|
2080 | """ |
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
|
2081 | 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
|
2082 | 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
|
2083 | """ |
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
|
2084 | if len(self.logTree.selectedItems()) == 1: |
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
|
2085 | 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
|
2086 | rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0] |
5353
60fcaa1c3c3c
Corrected some code style issues and regenerated the source docu files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5324
diff
changeset
|
2087 | bookmarks = [bm.strip() for bm in |
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
|
2088 | itm.text(self.BookmarksColumn).strip().split(",") |
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
|
2089 | if bm.strip()] |
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
|
2090 | 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
|
2091 | 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
|
2092 | 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
|
2093 | self.tr("Switch"), |
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
|
2094 | self.tr("Select bookmark to switch to (leave empty to" |
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
|
2095 | " use revision):"), |
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
|
2096 | [""] + 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
|
2097 | 0, False) |
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
|
2098 | 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
|
2099 | 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
|
2100 | 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
|
2101 | 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
|
2102 | if rev: |
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
|
2103 | shouldReopen = self.vcs.vcsUpdate(self.repodir, revision=rev) |
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
|
2104 | if shouldReopen: |
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
|
2105 | res = E5MessageBox.yesNo( |
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
|
2106 | 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
|
2107 | self.tr("Switch"), |
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
|
2108 | self.tr( |
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
|
2109 | """The project should be reread. Do this now?"""), |
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
|
2110 | yesDefault=True) |
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
|
2111 | if res: |
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
|
2112 | e5App().getObject("Project").reopenProject() |
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
|
2113 | return |
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
|
2114 | |
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
|
2115 | self.on_refreshButton_clicked() |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2116 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2117 | @pyqtSlot() |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2118 | def __bookmarkActTriggered(self): |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2119 | """ |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2120 | 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
|
2121 | """ |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2122 | if len(self.logTree.selectedItems()) == 1: |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2123 | itm = self.logTree.selectedItems()[0] |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2124 | rev, changeset = \ |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2125 | itm.text(self.RevisionColumn).strip().split(":", 1) |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2126 | 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
|
2127 | self, |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2128 | self.tr("Define Bookmark"), |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2129 | self.tr('Enter bookmark name for changeset "{0}":').format( |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2130 | changeset), |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2131 | QLineEdit.Normal) |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2132 | 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
|
2133 | self.vcs.hgBookmarkDefine( |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2134 | self.repodir, revision="rev({0})".format(rev), |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2135 | bookmark=bookmark) |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2136 | self.on_refreshButton_clicked() |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2137 | |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2138 | @pyqtSlot() |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2139 | def __bookmarkMoveActTriggered(self): |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2140 | """ |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2141 | 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
|
2142 | """ |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2143 | if len(self.logTree.selectedItems()) == 1: |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2144 | itm = self.logTree.selectedItems()[0] |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2145 | rev, changeset = \ |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2146 | itm.text(self.RevisionColumn).strip().split(":", 1) |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2147 | bookmarksList = self.vcs.hgGetBookmarksList(self.repodir) |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2148 | 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
|
2149 | self, |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2150 | self.tr("Move Bookmark"), |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2151 | self.tr('Select the bookmark to be moved to changeset' |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2152 | ' "{0}":').format(changeset), |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2153 | [""] + bookmarksList, |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2154 | 0, False) |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2155 | 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
|
2156 | self.vcs.hgBookmarkMove( |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2157 | self.repodir, revision="rev({0})".format(rev), |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2158 | bookmark=bookmark) |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2159 | self.on_refreshButton_clicked() |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2160 | |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5276
diff
changeset
|
2161 | @pyqtSlot() |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2162 | def __lfPullActTriggered(self): |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2163 | """ |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2164 | 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
|
2165 | """ |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2166 | revs = [] |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2167 | for itm in self.logTree.selectedItems(): |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2168 | 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
|
2169 | if rev: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2170 | revs.append(rev) |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2171 | |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2172 | if revs: |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2173 | self.vcs.getExtensionObject("largefiles").hgLfPull( |
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
2174 | self.repodir, revisions=revs) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2175 | |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2176 | @pyqtSlot() |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2177 | def __fetchActTriggered(self): |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2178 | """ |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2179 | Private slot to fetch changes from a remote repository. |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2180 | """ |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2181 | 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
|
2182 | refresh = False |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2183 | |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2184 | if self.initialCommandMode == "log": |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2185 | shouldReopen = self.vcs.getExtensionObject("fetch").hgFetch( |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2186 | self.repodir) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2187 | refresh = True |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2188 | elif self.initialCommandMode == "incoming": |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2189 | revs = [] |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2190 | for itm in self.logTree.selectedItems(): |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2191 | rev = itm.text(self.RevisionColumn).split(":")[1].strip() |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2192 | phase = itm.text(self.PhaseColumn).strip() |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2193 | if rev and 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
|
2194 | revs.append(rev) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2195 | if revs: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2196 | shouldReopen = self.vcs.getExtensionObject("fetch").hgFetch( |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2197 | self.repodir, ) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2198 | refresh = True |
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
|
2199 | if shouldReopen: |
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
|
2200 | res = E5MessageBox.yesNo( |
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
|
2201 | 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
|
2202 | self.tr("Fetch Changes"), |
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
|
2203 | self.tr( |
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
|
2204 | """The project should be reread. Do this now?"""), |
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
|
2205 | yesDefault=True) |
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
|
2206 | if res: |
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
|
2207 | e5App().getObject("Project").reopenProject() |
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
|
2208 | return |
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
|
2209 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2210 | if refresh: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2211 | self.on_refreshButton_clicked() |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2212 | |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2213 | @pyqtSlot() |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2214 | def __pullActTriggered(self): |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2215 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2216 | Private slot to pull changes from a remote repository. |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2217 | """ |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2218 | 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
|
2219 | refresh = False |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2220 | |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2221 | if self.initialCommandMode == "log": |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2222 | shouldReopen = self.vcs.hgPull(self.repodir) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2223 | refresh = True |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2224 | elif self.initialCommandMode == "incoming": |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2225 | revs = [] |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2226 | for itm in self.logTree.selectedItems(): |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2227 | rev = itm.text(self.RevisionColumn).split(":")[1].strip() |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2228 | phase = itm.text(self.PhaseColumn).strip() |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2229 | if rev and 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
|
2230 | revs.append(rev) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2231 | if revs: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2232 | shouldReopen = self.vcs.hgPull(self.repodir, revisions=revs) |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2233 | refresh = True |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2234 | |
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
|
2235 | if shouldReopen: |
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
|
2236 | res = E5MessageBox.yesNo( |
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
|
2237 | 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
|
2238 | self.tr("Pull Changes"), |
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
|
2239 | self.tr( |
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
|
2240 | """The project should be reread. Do this now?"""), |
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
|
2241 | yesDefault=True) |
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
|
2242 | if res: |
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
|
2243 | e5App().getObject("Project").reopenProject() |
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
|
2244 | return |
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
|
2245 | |
5512
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2246 | if refresh: |
f148796813d4
Enabled the action menu for the Mercurial log browser in 'incoming' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5506
diff
changeset
|
2247 | self.on_refreshButton_clicked() |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2248 | |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2249 | @pyqtSlot() |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2250 | def __pushActTriggered(self): |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2251 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2252 | 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
|
2253 | changeset. |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2254 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2255 | itm = self.logTree.selectedItems()[0] |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2256 | rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0] |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2257 | if rev: |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2258 | self.vcs.hgPush(self.repodir, rev=rev) |
4410
a3a2b652286d
Fixed forgotten refresh for the Mercurial log browser push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4409
diff
changeset
|
2259 | self.on_refreshButton_clicked() |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2260 | |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2261 | @pyqtSlot() |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2262 | def __pushAllActTriggered(self): |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2263 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2264 | 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
|
2265 | """ |
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2266 | self.vcs.hgPush(self.repodir) |
4410
a3a2b652286d
Fixed forgotten refresh for the Mercurial log browser push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4409
diff
changeset
|
2267 | self.on_refreshButton_clicked() |
4409
ff1cb0107d40
Enhanced the log browser functionality by pull and push actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4395
diff
changeset
|
2268 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2269 | @pyqtSlot() |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2270 | 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
|
2271 | """ |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2272 | 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
|
2273 | """ |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2274 | itm = self.logTree.selectedItems()[0] |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2275 | rev = itm.text(self.RevisionColumn).strip().split(":", 1)[1] |
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
|
2276 | shouldReopen = self.vcs.getExtensionObject("strip").hgStrip( |
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
|
2277 | self.repodir, rev=rev) |
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
|
2278 | if shouldReopen: |
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
|
2279 | res = E5MessageBox.yesNo( |
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
|
2280 | 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
|
2281 | self.tr("Strip Changesets"), |
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
|
2282 | self.tr( |
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
|
2283 | """The project should be reread. Do this now?"""), |
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
|
2284 | yesDefault=True) |
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
|
2285 | if res: |
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
|
2286 | e5App().getObject("Project").reopenProject() |
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
|
2287 | return |
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
|
2288 | |
5270
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2289 | self.on_refreshButton_clicked() |
7758f0c7d9f6
Added support for the strip and fetch extensions to the log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5104
diff
changeset
|
2290 | |
5496
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2291 | @pyqtSlot() |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2292 | 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
|
2293 | """ |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2294 | 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
|
2295 | changeset. |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2296 | """ |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2297 | itm = self.logTree.selectedItems()[0] |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2298 | rev = "rev({0})".format( |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2299 | itm.text(self.RevisionColumn).strip().split(":", 1)[0]) |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2300 | self.vcs.vcsMerge(self.repodir, rev=rev) |
d157a2319073
Added a 'Merge' action to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5494
diff
changeset
|
2301 | |
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
|
2302 | @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
|
2303 | 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
|
2304 | """ |
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
|
2305 | 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
|
2306 | """ |
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
|
2307 | if self.initialCommandMode == "log": |
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
|
2308 | selectedItems = self.logTree.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
|
2309 | 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
|
2310 | # 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
|
2311 | 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
|
2312 | "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
|
2313 | "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
|
2314 | "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
|
2315 | } |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2316 | 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
|
2317 | # the selected changeset is the 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
|
2318 | rev = selectedItems[0].text(self.RevisionColumn)\ |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2319 | .split(":", 1)[0].strip() |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2320 | 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
|
2321 | "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
|
2322 | "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
|
2323 | "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
|
2324 | } |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2325 | 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
|
2326 | # 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
|
2327 | 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
|
2328 | 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
|
2329 | rev = itm.text(self.RevisionColumn).split(":", 1)[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
|
2330 | try: |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2331 | 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
|
2332 | except ValueError: |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2333 | # ignore silently |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2334 | pass |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2335 | 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
|
2336 | 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
|
2337 | revs.remove(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
|
2338 | |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2339 | 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
|
2340 | "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
|
2341 | "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
|
2342 | "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
|
2343 | } |
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
|
2344 | 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
|
2345 | 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
|
2346 | 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
|
2347 | revs = [] |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2348 | 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
|
2349 | 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
|
2350 | revs.append(rev.strip()) |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2351 | |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2352 | bundleData = { |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2353 | "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
|
2354 | "base": "", |
2ccfb5077dd6
Enabled the action menu for the Mercurial log browser in 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5512
diff
changeset
|
2355 | "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
|
2356 | } |
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
|
2357 | |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2358 | self.vcs.hgBundle(self.repodir, bundleData=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
|
2359 | |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2360 | @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
|
2361 | 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
|
2362 | """ |
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
|
2363 | 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
|
2364 | """ |
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
|
2365 | if self.initialCommandMode == "incoming" and bool(self.__bundle): |
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
|
2366 | shouldReopen = self.vcs.hgUnbundle(self.repodir, |
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
|
2367 | files=[self.__bundle]) |
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
|
2368 | if shouldReopen: |
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
|
2369 | res = E5MessageBox.yesNo( |
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
|
2370 | 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
|
2371 | 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
|
2372 | self.tr("""The project should be reread. Do this now?"""), |
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
|
2373 | yesDefault=True) |
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
|
2374 | if res: |
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
|
2375 | e5App().getObject("Project").reopenProject() |
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
|
2376 | return |
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
|
2377 | |
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
|
2378 | self.on_refreshButton_clicked() |
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
|
2379 | |
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
|
2380 | @pyqtSlot() |
5506
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2381 | 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
|
2382 | """ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2383 | 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
|
2384 | """ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2385 | revs = [] |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2386 | for itm in self.logTree.selectedItems(): |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2387 | 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
|
2388 | if rev: |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2389 | revs.append(rev) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2390 | |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2391 | if revs: |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2392 | self.vcs.getExtensionObject("gpg").hgGpgSign( |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2393 | self.repodir, revisions=revs) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2394 | |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2395 | @pyqtSlot() |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2396 | 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
|
2397 | """ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2398 | 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
|
2399 | """ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2400 | rev = self.logTree.selectedItems()[0].text(self.RevisionColumn)\ |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2401 | .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
|
2402 | if rev: |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2403 | self.vcs.getExtensionObject("gpg").hgGpgVerifySignatures( |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2404 | self.repodir, rev=rev) |
9482a0ded319
Added a GPG actions to the Mercurial log browser action menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5503
diff
changeset
|
2405 | |
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
|
2406 | 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
|
2407 | """ |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2408 | Private method to select or unselect all log 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
|
2409 | |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2410 | @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
|
2411 | @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
|
2412 | """ |
20dd5c1e43ec
Finished adding a 'Create Changegroup' action to the Mercurial log browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5501
diff
changeset
|
2413 | 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
|
2414 | 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
|
2415 | 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
|
2416 | 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
|
2417 | self.on_logTree_itemSelectionChanged() |
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
|
2418 | |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2419 | def __actionMode(self): |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2420 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2421 | Private method to get the selected action mode. |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2422 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2423 | @return selected action mode (string, one of filter or find) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2424 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2425 | return self.modeComboBox.itemData( |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2426 | self.modeComboBox.currentIndex()) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2427 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2428 | @pyqtSlot(int) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2429 | 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
|
2430 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2431 | Private slot to react on mode changes. |
4080
d4ba5fab5557
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4060
diff
changeset
|
2432 | |
d4ba5fab5557
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4060
diff
changeset
|
2433 | @param index index of the selected entry (integer) |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2434 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2435 | 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
|
2436 | findMode = mode == "find" |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2437 | filterMode = mode == "filter" |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2438 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2439 | 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
|
2440 | 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
|
2441 | 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
|
2442 | 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
|
2443 | self.findNextButton.setVisible(findMode) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2444 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2445 | if findMode: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2446 | 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
|
2447 | 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
|
2448 | 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
|
2449 | elif filterMode: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2450 | self.__filterLogs() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2451 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2452 | @pyqtSlot() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2453 | 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
|
2454 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2455 | 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
|
2456 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2457 | self.__findItem(True) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2458 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2459 | @pyqtSlot() |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2460 | 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
|
2461 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2462 | 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
|
2463 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2464 | self.__findItem(False) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2465 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2466 | 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
|
2467 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2468 | Private slot to find an 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
|
2469 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2470 | @param backwards flag indicating to search backwards (boolean) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2471 | @param interactive flag indicating an interactive search (boolean) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2472 | """ |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2473 | self.__findBackwards = backwards |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2474 | |
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
|
2475 | fieldIndex, searchRx, indexIsRole = self.__prepareFieldSearch() |
4059
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2476 | currentIndex = self.logTree.indexOfTopLevelItem( |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2477 | self.logTree.currentItem()) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2478 | if backwards: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2479 | if interactive: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2480 | 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
|
2481 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2482 | 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
|
2483 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2484 | if interactive: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2485 | 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
|
2486 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2487 | indexes = range(currentIndex + 1, |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2488 | self.logTree.topLevelItemCount()) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2489 | |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2490 | 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
|
2491 | 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
|
2492 | 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
|
2493 | 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
|
2494 | 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
|
2495 | txt = "\n".join( |
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
|
2496 | [c["path"] for c in changes] + |
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
|
2497 | [c["copyfrom"] for c in changes] |
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
|
2498 | ) |
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
|
2499 | 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
|
2500 | # 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
|
2501 | 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
|
2502 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2503 | txt = topItem.text(fieldIndex) |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2504 | if searchRx.indexIn(txt) > -1: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2505 | 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
|
2506 | break |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2507 | else: |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2508 | E5MessageBox.information( |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2509 | self, |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2510 | self.tr("Find Commit"), |
15b78ac687fb
Enhanced the Mercurial log browser functionality by a search mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2511 | self.tr("""'{0}' was not found.""").format(self.rxEdit.text())) |
5445
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2512 | |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2513 | 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
|
2514 | """ |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2515 | 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
|
2516 | details pane. |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2517 | |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2518 | @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
|
2519 | @type QUrl |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2520 | """ |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2521 | if url.scheme() == "rev": |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2522 | # a parent or child revision was clicked, show the respective item |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2523 | rev = url.path() |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2524 | searchStr = "{0:>7}:".format(rev) |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2525 | # format must be in sync with item generation format |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2526 | items = self.logTree.findItems(searchStr, Qt.MatchStartsWith, |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2527 | self.RevisionColumn) |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2528 | if items: |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2529 | itm = items[0] |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2530 | if itm.isHidden(): |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2531 | itm.setHidden(False) |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2532 | 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
|
2533 | else: |
b24720037f1f
Added clickable links to the Mercurial log browser details pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5444
diff
changeset
|
2534 | # load the next batch and try again |
5490
95db14ec60b2
Added some code to cope with unlimited recursions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5489
diff
changeset
|
2535 | if self.nextButton.isEnabled(): |
5493
09cd66fa3243
Fixed an issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5490
diff
changeset
|
2536 | self.__addFinishCallback( |
09cd66fa3243
Fixed an issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5490
diff
changeset
|
2537 | lambda: self.__revisionClicked(url)) |
5490
95db14ec60b2
Added some code to cope with unlimited recursions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5489
diff
changeset
|
2538 | self.on_nextButton_clicked() |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2539 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2540 | ########################################################################### |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2541 | ## 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
|
2542 | ########################################################################### |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2543 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2544 | 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
|
2545 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2546 | Private slot to generate diff outputs for the selected item. |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2547 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2548 | @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
|
2549 | @type int |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2550 | """ |
5518
2c5a6446980a
Little enhancement to the Mercurial log browser diff pane.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5517
diff
changeset
|
2551 | 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
|
2552 | 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
|
2553 | self.diffSelectLabel.clear() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2554 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2555 | 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
|
2556 | 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
|
2557 | currentItem = selectedItems[0] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2558 | 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
|
2559 | 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
|
2560 | if len(parents) >= parent: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2561 | self.diffLabel.setText( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2562 | self.tr("Differences to Parent {0}").format(parent)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2563 | rev1 = parents[parent - 1] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2564 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2565 | self.__diffGenerator.start(self.__filename, [rev1, rev2], |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2566 | self.__bundle) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2567 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2568 | 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
|
2569 | if parent == 1: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2570 | par1 = " 1 " |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2571 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2572 | 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
|
2573 | if parent == 2: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2574 | par2 = " 2 " |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2575 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2576 | 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
|
2577 | self.diffSelectLabel.setText( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2578 | self.tr('Diff to Parent {0}{1}').format(par1, par2)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2579 | 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
|
2580 | rev2 = int(selectedItems[0].text( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2581 | self.RevisionColumn).split(":")[0]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2582 | rev1 = int(selectedItems[1].text( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2583 | self.RevisionColumn).split(":")[0]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2584 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2585 | self.__diffGenerator.start(self.__filename, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2586 | [min(rev1, rev2), max(rev1, rev2)], |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2587 | self.__bundle) |
5562
19f22f304e2c
Implemented a little fix for the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5518
diff
changeset
|
2588 | else: |
19f22f304e2c
Implemented a little fix for the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5518
diff
changeset
|
2589 | self.diffEdit.clear() |
5477
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2590 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2591 | def __generatorFinished(self): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2592 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2593 | 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
|
2594 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2595 | diff, errors, fileSeparators = self.__diffGenerator.getResult() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2596 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2597 | if diff: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2598 | 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
|
2599 | elif errors: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2600 | 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
|
2601 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2602 | self.diffEdit.setPlainText(self.tr('There is no difference.')) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2603 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2604 | self.saveLabel.setVisible(bool(diff)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2605 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2606 | if self.__diffUpdatesFiles: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2607 | 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
|
2608 | if oldFileName == newFileName: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2609 | fileName = oldFileName |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2610 | elif oldFileName == "__NULL__": |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2611 | fileName = newFileName |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2612 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2613 | fileName = oldFileName |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2614 | 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
|
2615 | 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
|
2616 | self.__resizeColumnsFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2617 | self.__resortFiles() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2618 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2619 | 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
|
2620 | 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
|
2621 | if fileName != "__NULL__": |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2622 | items = self.filesTree.findItems( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2623 | fileName, Qt.MatchExactly, 1) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2624 | for item in items: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2625 | item.setData(0, self.__diffFileLineRole, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2626 | lineNumber) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2627 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2628 | 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
|
2629 | tc.movePosition(QTextCursor.Start) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2630 | 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
|
2631 | self.diffEdit.ensureCursorVisible() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2632 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2633 | @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2634 | 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
|
2635 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2636 | Private slot called, when the current item of the files tree changes. |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2637 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2638 | @param current reference to the new current item (QTreeWidgetItem) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2639 | @param previous reference to the old current item (QTreeWidgetItem) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2640 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2641 | if current: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2642 | 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
|
2643 | 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
|
2644 | if para == 0: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2645 | 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
|
2646 | tc.movePosition(QTextCursor.Start) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2647 | 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
|
2648 | self.diffEdit.ensureCursorVisible() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2649 | elif para == -1: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2650 | 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
|
2651 | tc.movePosition(QTextCursor.End) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2652 | 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
|
2653 | self.diffEdit.ensureCursorVisible() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2654 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2655 | # 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
|
2656 | 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
|
2657 | tc.movePosition(QTextCursor.End) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2658 | 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
|
2659 | self.diffEdit.ensureCursorVisible() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2660 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2661 | # 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
|
2662 | 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
|
2663 | delta = tc.blockNumber() - para |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2664 | tc.movePosition(QTextCursor.PreviousBlock, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2665 | QTextCursor.MoveAnchor, delta) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2666 | 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
|
2667 | self.diffEdit.ensureCursorVisible() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2668 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2669 | @pyqtSlot(str) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2670 | 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
|
2671 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2672 | Private slot to handle the selection of a diff target. |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2673 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2674 | @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
|
2675 | @type str |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2676 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2677 | if ":" in link: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2678 | 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
|
2679 | if scheme == "diff": |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2680 | try: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2681 | parent = int(parent) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2682 | self.__generateDiffs(parent) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2683 | except ValueError: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2684 | # ignore silently |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2685 | pass |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2686 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2687 | @pyqtSlot(str) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2688 | 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
|
2689 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2690 | Private slot to handle the selection of the save link. |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2691 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2692 | @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
|
2693 | @type str |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2694 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2695 | 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
|
2696 | return |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2697 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2698 | 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
|
2699 | 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
|
2700 | return |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2701 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2702 | if self.projectMode: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2703 | fname = self.vcs.splitPath(self.__filename)[0] |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2704 | fname += "/{0}.diff".format(os.path.split(fname)[-1]) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2705 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2706 | dname, fname = self.vcs.splitPath(self.__filename) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2707 | if fname != '.': |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2708 | 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
|
2709 | else: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2710 | fname = dname |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2711 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2712 | fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2713 | self, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2714 | 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
|
2715 | fname, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2716 | 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
|
2717 | None, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2718 | E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2719 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2720 | if not fname: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2721 | return # user aborted |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2722 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2723 | ext = QFileInfo(fname).suffix() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2724 | if not ext: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2725 | 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
|
2726 | if ex: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2727 | fname += ex |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2728 | if QFileInfo(fname).exists(): |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2729 | res = E5MessageBox.yesNo( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2730 | self, |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2731 | 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
|
2732 | self.tr("<p>The patch file <b>{0}</b> already exists." |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2733 | " Overwrite it?</p>").format(fname), |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2734 | icon=E5MessageBox.Warning) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2735 | if not res: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2736 | return |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2737 | fname = Utilities.toNativeSeparators(fname) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2738 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2739 | eol = e5App().getObject("Project").getEolString() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2740 | try: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2741 | f = open(fname, "w", encoding="utf-8", newline="") |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2742 | f.write(eol.join(self.diffEdit.toPlainText().splitlines())) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2743 | f.close() |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2744 | except IOError as why: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2745 | E5MessageBox.critical( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2746 | self, 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
|
2747 | self.tr( |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2748 | '<p>The patch file <b>{0}</b> could not be saved.' |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2749 | '<br>Reason: {1}</p>') |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2750 | .format(fname, str(why))) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2751 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2752 | @pyqtSlot(str) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2753 | 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
|
2754 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2755 | Private slot to handle selection of a side-by-side link. |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2756 | |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2757 | @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
|
2758 | @type str |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2759 | """ |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2760 | if ":" in link: |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2761 | 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
|
2762 | 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
|
2763 | rev1, rev2 = path.split("_", 1) |
fb8875e356d4
Fixed a bug in the Mercurial GPG verify signature dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5463
diff
changeset
|
2764 | self.vcs.hgSbsDiff(self.__filename, revisions=(rev1, rev2)) |