Sat, 13 Apr 2013 13:10:43 +0200
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
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 | |
2302
f29e9405c851
Updated copyright for 2013.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2223
diff
changeset
|
3 | # Copyright (c) 2010 - 2013 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 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | import os |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
12 | from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
13 | QSize, QPoint |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
14 | from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ |
1131
7781e396c903
Changed the code to use super() to access the superclass.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1086
diff
changeset
|
15 | QTreeWidgetItem, QApplication, QCursor, QLineEdit, QColor, \ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
16 | QPixmap, QPainter, QPen, QBrush, QIcon |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | |
207
3f889378dede
Added some code to inspect incoming patches as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
18 | from E5Gui.E5Application import e5App |
537
72b32daeb8d6
Continued replacing QMessageBox methods with own methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
470
diff
changeset
|
19 | from E5Gui import E5MessageBox |
207
3f889378dede
Added some code to inspect incoming patches as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
20 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | import Preferences |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
25 | COLORNAMES = ["blue", "darkgreen", "red", "green", "darkblue", "purple", |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
26 | "cyan", "olive", "magenta", "darkred", "darkmagenta", |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
27 | "darkcyan", "gray", "yellow"] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
28 | COLORS = [str(QColor(x).name()) for x in COLORNAMES] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
29 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
30 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | class HgLogBrowserDialog(QDialog, Ui_HgLogBrowserDialog): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | 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
|
34 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
35 | 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
|
36 | BranchColumn = 1 |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
37 | RevisionColumn = 2 |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
38 | PhaseColumn = 3 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
39 | AuthorColumn = 4 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
40 | DateColumn = 5 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
41 | MessageColumn = 6 |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
42 | TagsColumn = 7 |
180
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 | def __init__(self, vcs, mode="log", bundle=None, parent=None): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | Constructor |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | @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
|
49 | @param mode mode of the dialog (string; one of log, incoming, outgoing) |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
50 | @param bundle name of a bundle file (string) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | @param parent parent widget (QWidget) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | """ |
1131
7781e396c903
Changed the code to use super() to access the superclass.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1086
diff
changeset
|
53 | super().__init__(parent) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | self.setupUi(self) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | |
782
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
56 | if mode == "log": |
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
57 | self.setWindowTitle(self.trUtf8("Mercurial Log")) |
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
58 | elif mode == "incoming": |
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
59 | self.setWindowTitle(self.trUtf8("Mercurial Log (Incoming)")) |
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
60 | elif mode == "outgoing": |
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
61 | self.setWindowTitle(self.trUtf8("Mercurial Log (Outgoing)")) |
2c567a5ceade
Added different window titles to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
781
diff
changeset
|
62 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
69 | self.refreshButton = \ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
70 | self.buttonBox.addButton(self.trUtf8("&Refresh"), QDialogButtonBox.ActionRole) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
71 | self.refreshButton.setToolTip( |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
72 | self.trUtf8("Press to refresh the list of changesets")) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
73 | self.refreshButton.setEnabled(False) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
74 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | 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
|
76 | 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
|
77 | 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
|
78 | 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
|
79 | else: |
215
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
80 | self.commandMode = "log" |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
81 | self.bundle = bundle |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
82 | self.__hgClient = vcs.getClient() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
84 | self.__initData() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
85 | |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
86 | self.__allBranchesFilter = self.trUtf8("All") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | self.fromDate.setDisplayFormat("yyyy-MM-dd") |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | self.toDate.setDisplayFormat("yyyy-MM-dd") |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | self.fromDate.setDate(QDate.currentDate()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | self.toDate.setDate(QDate.currentDate()) |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
92 | self.fieldCombo.setCurrentIndex(self.fieldCombo.findText( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
93 | self.trUtf8("Message"))) |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
94 | self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
95 | "LogLimit")) |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
96 | self.stopCheckBox.setChecked(self.vcs.getPlugin().getPreferences( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
97 | "StopLogOnCopy")) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | |
779
04c3a6026543
Fixed an issue where long incoming patchsets were not shown completely.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
99 | if mode 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
|
100 | self.nextButton.setEnabled(False) |
04c3a6026543
Fixed an issue where long incoming patchsets were not shown completely.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
101 | self.limitSpinBox.setEnabled(False) |
04c3a6026543
Fixed an issue where long incoming patchsets were not shown completely.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
102 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | self.__messageRole = Qt.UserRole |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
104 | 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
|
105 | 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
|
106 | self.__parentsRole = Qt.UserRole + 3 |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
108 | if self.__hgClient: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
109 | self.process = None |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
110 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
111 | self.process = QProcess() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
112 | 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
|
113 | 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
|
114 | self.process.readyReadStandardError.connect(self.__readStderr) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | self.flags = { |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
117 | 'A': self.trUtf8('Added'), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
118 | 'D': self.trUtf8('Deleted'), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
119 | 'M': self.trUtf8('Modified'), |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | } |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
122 | self.__dotRadius = 8 |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
123 | self.__rowHeight = 20 |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
124 | |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
125 | self.logTree.setIconSize( |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
126 | QSize(100 * self.__rowHeight, self.__rowHeight)) |
1263
1b6054a9b668
Fixed the treatment of the Mercurial version number.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1256
diff
changeset
|
127 | if self.vcs.version >= (1, 8): |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
128 | self.logTree.headerItem().setText(self.logTree.columnCount(), |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
129 | self.trUtf8("Bookmarks")) |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
130 | if self.vcs.version < (2, 1): |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
131 | self.logTree.setColumnHidden(self.PhaseColumn, True) |
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
|
132 | self.phaseLine.hide() |
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
|
133 | self.phaseButton.hide() |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
134 | if self.vcs.version < (2, 0): |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
135 | self.graftButton.setEnabled(False) |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
136 | self.graftButton.hide() |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
137 | if self.phaseButton.isHidden() and \ |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
138 | self.graftButton.isHidden(): |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
139 | self.phaseLine.hide() |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
140 | |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
141 | def __initData(self): |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
142 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
143 | Private method to (re-)initialize some data. |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
144 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
145 | self.__maxDate = QDate() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
146 | self.__minDate = QDate() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
147 | self.__filterLogsEnabled = True |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
148 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
149 | self.buf = [] # buffer for stdout |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
150 | self.diff = None |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
151 | self.__started = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
152 | self.__lastRev = 0 |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
153 | self.projectMode = False |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
154 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
155 | # attributes to store log graph data |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
156 | self.__revs = [] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
157 | self.__revColors = {} |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
158 | self.__revColor = 0 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
159 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
160 | 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
|
161 | |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
162 | 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
|
163 | self.__projectBranch = "" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | def closeEvent(self, e): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
167 | Private slot implementing a close event handler. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | @param e close event (QCloseEvent) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | """ |
1256
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
171 | if self.__hgClient: |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
172 | if self.__hgClient.isExecuting(): |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
173 | self.__hgClient.cancel() |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
174 | else: |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
175 | if self.process is not None and \ |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
176 | self.process.state() != QProcess.NotRunning: |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
177 | self.process.terminate() |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
178 | QTimer.singleShot(2000, self.process.kill) |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1250
diff
changeset
|
179 | self.process.waitForFinished(3000) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
181 | e.accept() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
182 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | def __resizeColumnsLog(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
184 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | 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
|
186 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
187 | self.logTree.header().resizeSections(QHeaderView.ResizeToContents) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
188 | self.logTree.header().setStretchLastSection(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
189 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | def __resizeColumnsFiles(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | 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
|
193 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | self.filesTree.header().resizeSections(QHeaderView.ResizeToContents) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | self.filesTree.header().setStretchLastSection(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | def __resortFiles(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
198 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | 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
|
200 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | sortColumn = self.filesTree.sortColumn() |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
202 | self.filesTree.sortItems(1, |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
203 | self.filesTree.header().sortIndicatorOrder()) |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
204 | self.filesTree.sortItems(sortColumn, |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
205 | self.filesTree.header().sortIndicatorOrder()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
207 | def __getColor(self, n): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
208 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
209 | 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
|
210 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
211 | @param n color index (integer) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
212 | @return color name (string) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
213 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
214 | return COLORS[n % len(COLORS)] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
215 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
216 | def __branchColor(self, branchName): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
217 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
218 | Private method to calculate a color for a given branch name. |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
219 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
220 | @param branchName name of the branch (string) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
221 | @return name of the color to use (string) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
222 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
223 | 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
|
224 | 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
|
225 | len(self.__branchColors)) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
226 | return self.__branchColors[branchName] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
227 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
228 | def __generateEdges(self, rev, parents): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
229 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
230 | Private method to generate edge info for the give data. |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
231 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
232 | @param rev revision to calculate edge info for (integer) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
233 | @param parents list of parent revisions (list of integers) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
234 | @return tuple containing the column and color index for |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
235 | 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
|
236 | between the given node and its parents |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
237 | (integer, integer, [(integer, integer, integer), ...]) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
238 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
239 | if rev not in self.__revs: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
240 | # new head |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
241 | self.__revs.append(rev) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
242 | self.__revColors[rev] = self.__revColor |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
243 | self.__revColor += 1 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
244 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
245 | col = self.__revs.index(rev) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
246 | color = self.__revColors.pop(rev) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
247 | next = self.__revs[:] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
248 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
249 | # add parents to next |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
250 | addparents = [p for p in parents if p not in next] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
251 | next[col:col + 1] = addparents |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
252 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
253 | # set colors for the parents |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
254 | for i, p in enumerate(addparents): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
255 | if not i: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
256 | self.__revColors[p] = color |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
257 | else: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
258 | self.__revColors[p] = self.__revColor |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
259 | self.__revColor += 1 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
260 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
261 | # add edges to the graph |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
262 | edges = [] |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
263 | if parents[0] != -1: |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
264 | for ecol, erev in enumerate(self.__revs): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
265 | 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
|
266 | edges.append( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
267 | (ecol, next.index(erev), self.__revColors[erev])) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
268 | elif erev == rev: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
269 | 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
|
270 | edges.append( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
271 | (ecol, next.index(p), self.__revColors[p])) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
272 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
273 | self.__revs = next |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
274 | return col, color, edges |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
275 | |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
276 | 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
|
277 | currentRev, closed): |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
278 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
279 | 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
|
280 | given data. |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
281 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
282 | @param column column index of the revision (integer) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
283 | @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
|
284 | @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
|
285 | (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
|
286 | @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
|
287 | (list of tuples of three integers) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
288 | @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
|
289 | @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
|
290 | 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
|
291 | @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
|
292 | branch (boolean) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
293 | @return icon for the node (QIcon) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
294 | """ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
295 | 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
|
296 | """ |
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
|
297 | 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
|
298 | |
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
|
299 | @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
|
300 | @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
|
301 | """ |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
302 | return int(1.2 * radius) * col + radius // 2 + 3 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
303 | |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
304 | radius = self.__dotRadius |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
305 | w = len(bottomedges) * radius + 20 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
306 | 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
|
307 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
308 | dot_x = col2x(column, radius) - radius // 2 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
309 | 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
|
310 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
311 | pix = QPixmap(w, h) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
312 | pix.fill(QColor(0, 0, 0, 0)) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
313 | painter = QPainter(pix) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
314 | 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
|
315 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
316 | pen = QPen(Qt.blue) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
317 | pen.setWidth(2) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
318 | 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
|
319 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
320 | lpen = QPen(pen) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
321 | lpen.setColor(Qt.black) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
322 | 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
|
323 | |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
324 | # draw the revision history lines |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
325 | for y1, y2, lines in ((0, h, bottomedges), |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
326 | (-h, 0, topedges)): |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
327 | if lines: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
328 | for start, end, ecolor in lines: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
329 | lpen = QPen(pen) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
330 | lpen.setColor(QColor(self.__getColor(ecolor))) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
331 | lpen.setWidth(2) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
332 | painter.setPen(lpen) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
333 | x1 = col2x(start, radius) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
334 | x2 = col2x(end, radius) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
335 | 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
|
336 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
337 | penradius = 1 |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
338 | 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
|
339 | |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
340 | 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
|
341 | |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
342 | # 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
|
343 | 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
|
344 | # 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
|
345 | 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
|
346 | 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
|
347 | 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
|
348 | 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
|
349 | penradius = 3 |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
350 | painter.setBrush(dotColor) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
351 | pen = QPen(pencolor) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
352 | pen.setWidth(penradius) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
353 | 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
|
354 | if closed: |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
355 | 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
|
356 | 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
|
357 | 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
|
358 | 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
|
359 | 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
|
360 | 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
|
361 | 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
|
362 | 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
|
363 | 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
|
364 | ) |
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
|
365 | 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
|
366 | painter.drawEllipse(dot_x, dot_y, radius, radius) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
367 | painter.end() |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
368 | return QIcon(pix) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
369 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
370 | def __getParents(self, rev): |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
371 | """ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
372 | 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
|
373 | file/directory. |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
374 | |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
375 | @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
|
376 | @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
|
377 | """ |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
378 | errMsg = "" |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
379 | parents = [-1] |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
380 | |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
381 | args = [] |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
382 | args.append("parents") |
215
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
383 | if self.commandMode == "incoming": |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
384 | if self.bundle: |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
385 | args.append("--repository") |
215
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
386 | args.append(self.bundle) |
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
387 | elif self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
388 | args.append("--repository") |
215
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
389 | 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
|
390 | args.append("--template") |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
391 | args.append("{rev}\n") |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
392 | args.append("-r") |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
393 | args.append(rev) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
394 | if not self.projectMode: |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
395 | args.append(self.filename) |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
396 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
397 | output = "" |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
398 | if self.__hgClient: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
399 | 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
|
400 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
401 | process = QProcess() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
402 | process.setWorkingDirectory(self.repodir) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
403 | process.start('hg', args) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
404 | procStarted = process.waitForStarted() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
405 | if procStarted: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
406 | finished = process.waitForFinished(30000) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
407 | if finished and process.exitCode() == 0: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
408 | output = \ |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
409 | str(process.readAllStandardOutput(), |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
410 | Preferences.getSystem("IOEncoding"), |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
411 | 'replace') |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
412 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
413 | if not finished: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
414 | errMsg = self.trUtf8( |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
415 | "The hg process did not finish within 30s.") |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
416 | else: |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
417 | errMsg = self.trUtf8("Could not start the hg executable.") |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
418 | |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
419 | if errMsg: |
537
72b32daeb8d6
Continued replacing QMessageBox methods with own methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
470
diff
changeset
|
420 | E5MessageBox.critical(self, |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
421 | self.trUtf8("Mercurial Error"), |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
422 | errMsg) |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
423 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
424 | if output: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
425 | parents = [int(p) for p in output.strip().splitlines()] |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
426 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
427 | return parents |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
428 | |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
429 | 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
|
430 | """ |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
431 | 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
|
432 | """ |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
433 | errMsg = "" |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
434 | |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
435 | args = [] |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
436 | args.append("identify") |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
437 | 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
|
438 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
439 | output = "" |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
440 | if self.__hgClient: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
441 | 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
|
442 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
443 | process = QProcess() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
444 | process.setWorkingDirectory(self.repodir) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
445 | process.start('hg', args) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
446 | procStarted = process.waitForStarted() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
447 | if procStarted: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
448 | finished = process.waitForFinished(30000) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
449 | if finished and process.exitCode() == 0: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
450 | output = \ |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
451 | str(process.readAllStandardOutput(), |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
452 | Preferences.getSystem("IOEncoding"), |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
453 | 'replace') |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
454 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
455 | if not finished: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
456 | errMsg = self.trUtf8( |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
457 | "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
|
458 | else: |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
459 | errMsg = self.trUtf8("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
|
460 | |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
461 | if errMsg: |
537
72b32daeb8d6
Continued replacing QMessageBox methods with own methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
470
diff
changeset
|
462 | E5MessageBox.critical(self, |
241
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
463 | self.trUtf8("Mercurial Error"), |
aaa856499ed5
Added code to the Mercurial log browser to highlight the current revision.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
236
diff
changeset
|
464 | errMsg) |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
465 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
466 | if output: |
2544
3868561e3962
Fixed an issue introduced by the last changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2543
diff
changeset
|
467 | 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
|
468 | 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
|
469 | 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
|
470 | 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
|
471 | self.__projectRevision = self.__projectRevision[:-1] |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
472 | 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
|
473 | |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
474 | def __getClosedBranches(self): |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
475 | """ |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
476 | 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
|
477 | """ |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
478 | self.__closedBranchesRevs = [] |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
479 | errMsg = "" |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
480 | |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
481 | args = [] |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
482 | args.append("branches") |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
483 | args.append("--closed") |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
484 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
485 | output = "" |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
486 | if self.__hgClient: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
487 | 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
|
488 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
489 | process = QProcess() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
490 | process.setWorkingDirectory(self.repodir) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
491 | process.start('hg', args) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
492 | procStarted = process.waitForStarted() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
493 | if procStarted: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
494 | finished = process.waitForFinished(30000) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
495 | if finished and process.exitCode() == 0: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
496 | output = \ |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
497 | str(process.readAllStandardOutput(), |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
498 | Preferences.getSystem("IOEncoding"), |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
499 | 'replace') |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
500 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
501 | if not finished: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
502 | errMsg = self.trUtf8( |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
503 | "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
|
504 | else: |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
505 | errMsg = self.trUtf8("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
|
506 | |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
507 | if errMsg: |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
508 | E5MessageBox.critical(self, |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
509 | self.trUtf8("Mercurial Error"), |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
510 | errMsg) |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
511 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
512 | if output: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
513 | 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
|
514 | 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
|
515 | parts = line.split() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
516 | self.__closedBranchesRevs.append( |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
517 | 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
|
518 | |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
519 | def __generateLogItem(self, author, date, message, revision, changedPaths, |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
520 | parents, branches, tags, phase, bookmarks=None): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
521 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
522 | 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
|
523 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
524 | @param author author info (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
525 | @param date date info (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
526 | @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
|
527 | @param revision revision info (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
528 | @param changedPaths list of dictionary objects containing |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
529 | 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
|
530 | @param parents list of parent revisions (list of integers) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
531 | @param branches list of branches (list of strings) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
532 | @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
|
533 | @param phase phase of the entry (string) |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
534 | @param bookmarks list of bookmarks (string) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
535 | @return reference to the generated item (QTreeWidgetItem) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
536 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
537 | msg = [] |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
538 | for line in message: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
539 | msg.append(line.strip()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
540 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
541 | rev, node = revision.split(":") |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
542 | if rev in self.__closedBranchesRevs: |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
543 | closedStr = "--" |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
544 | else: |
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
545 | closedStr = "" |
185
f002e13c9aed
Some more finetuning of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
546 | msgtxt = msg[0] |
f002e13c9aed
Some more finetuning of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
547 | if len(msgtxt) > 30: |
f002e13c9aed
Some more finetuning of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
548 | msgtxt = "{0}...".format(msgtxt[:30]) |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
549 | 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
|
550 | "", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
551 | 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
|
552 | "{0:>7}:{1}".format(rev, node), |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
553 | phase, |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
554 | author, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
555 | date, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
556 | msgtxt, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
557 | ", ".join(tags), |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
558 | ] |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
559 | if bookmarks is not None: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
560 | columnLabels.append(", ".join(bookmarks)) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
561 | itm = QTreeWidgetItem(self.logTree, columnLabels) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
562 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
563 | itm.setForeground(self.BranchColumn, |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
564 | QBrush(QColor(self.__branchColor(branches[0])))) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
565 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
566 | if not self.projectMode: |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
567 | 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
|
568 | if not parents: |
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
569 | parents = [int(rev) - 1] |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
570 | column, color, edges = self.__generateEdges(int(rev), parents) |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
571 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
572 | itm.setData(0, self.__messageRole, message) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
573 | 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
|
574 | itm.setData(0, self.__edgesRole, edges) |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
575 | itm.setData(0, self.__parentsRole, parents) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
576 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
577 | 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
|
578 | topedges = \ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
579 | self.logTree.topLevelItem( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
580 | 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
|
581 | .data(0, self.__edgesRole) |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
582 | else: |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
583 | topedges = None |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
584 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
585 | 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
|
586 | 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
|
587 | 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
|
588 | 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
|
589 | itm.setIcon(0, icon) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
590 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
591 | try: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
592 | self.__lastRev = int(revision.split(":")[0]) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
593 | except ValueError: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
594 | self.__lastRev = 0 |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
595 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
596 | return itm |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
597 | |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
598 | def __generateFileItem(self, action, path, copyfrom): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
599 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
600 | Private method to generate a changed files tree entry. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
601 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
602 | @param action indicator for the change action ("A", "D" or "M") |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
603 | @param path path of the file in the repository (string) |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
604 | @param copyfrom path the file was copied from (string) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
605 | @return reference to the generated item (QTreeWidgetItem) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
606 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
607 | itm = QTreeWidgetItem(self.filesTree, [ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
608 | self.flags[action], |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
609 | path, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
610 | copyfrom, |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
611 | ]) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
612 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
613 | return itm |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
614 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
615 | def __getLogEntries(self, startRev=None): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
616 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
617 | 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
|
618 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
619 | @param startRev revision number to start from (integer, string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
620 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
621 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
622 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
623 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
624 | QApplication.processEvents() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
625 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
626 | QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
627 | QApplication.processEvents() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
628 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
629 | self.buf = [] |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
630 | self.cancelled = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
631 | self.errors.clear() |
1269
7b4d9f1d7c6c
Fixed an issue in the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1265
diff
changeset
|
632 | self.intercept = False |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
633 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
634 | args = [] |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
635 | args.append(self.commandMode) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
636 | self.vcs.addArguments(args, self.vcs.options['global']) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
637 | self.vcs.addArguments(args, self.vcs.options['log']) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
638 | 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
|
639 | 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
|
640 | args.append('--limit') |
04c3a6026543
Fixed an issue where long incoming patchsets were not shown completely.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
537
diff
changeset
|
641 | args.append(str(self.limitSpinBox.value())) |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
642 | 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
|
643 | args.append("--newest-first") |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1637
diff
changeset
|
644 | if self.vcs.hasSubrepositories(): |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1637
diff
changeset
|
645 | args.append("--subrepos") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
646 | if startRev is not None: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
647 | args.append('--rev') |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
648 | 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
|
649 | 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
|
650 | not self.fname == "." and \ |
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
651 | not self.stopCheckBox.isChecked(): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
652 | 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
|
653 | 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
|
654 | args.append('--copies') |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
655 | args.append('--style') |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
656 | if self.vcs.version >= (2, 1): |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
657 | args.append(os.path.join(os.path.dirname(__file__), |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
658 | "styles", "logBrowserBookmarkPhase.style")) |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
659 | elif self.vcs.version >= (1, 8): |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
660 | args.append(os.path.join(os.path.dirname(__file__), |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
661 | "styles", "logBrowserBookmark.style")) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
662 | else: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
663 | args.append(os.path.join(os.path.dirname(__file__), |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
664 | "styles", "logBrowser.style")) |
215
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
665 | if self.commandMode == "incoming": |
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
666 | if self.bundle: |
e8978dca44af
Fixed issues with non-existing bundle caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
667 | args.append(self.bundle) |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1637
diff
changeset
|
668 | elif not self.vcs.hasSubrepositories(): |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
669 | project = e5App().getObject("Project") |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
670 | self.vcs.bundleFile = os.path.join( |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
671 | project.getProjectManagementDir(), "hg-bundle.hg") |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
672 | args.append('--bundle') |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
673 | 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
|
674 | if not self.projectMode: |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
675 | args.append(self.filename) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
676 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
677 | 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
|
678 | 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
|
679 | 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
|
680 | |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
681 | out, err = self.__hgClient.runcommand(args) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
682 | self.buf = out.splitlines(True) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
683 | if err: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
684 | self.__showError(err) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
685 | self.__processBuffer() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
686 | self.__finish() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
687 | else: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
688 | self.process.kill() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
689 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
690 | 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
|
691 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
692 | self.inputGroup.setEnabled(True) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
693 | self.inputGroup.show() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
694 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
695 | self.process.start('hg', args) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
696 | procStarted = self.process.waitForStarted() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
697 | if not procStarted: |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
698 | self.inputGroup.setEnabled(False) |
1248
7d0eff6435a9
Added a forgotten line of code to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1242
diff
changeset
|
699 | self.inputGroup.hide() |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
700 | E5MessageBox.critical(self, |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
701 | self.trUtf8('Process Generation Error'), |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
702 | self.trUtf8( |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
703 | 'The process {0} could not be started. ' |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
704 | 'Ensure, that it is in the search path.' |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
705 | ).format('hg')) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
706 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
707 | def start(self, fn): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
708 | """ |
198
7ab8e126f404
Fixed a few issues with the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
709 | 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
|
710 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
711 | @param fn filename to show the log for (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
712 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
713 | self.errorGroup.hide() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
714 | QApplication.processEvents() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
715 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
716 | self.filename = fn |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
717 | 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
|
718 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
719 | # find the root of the repo |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
720 | self.repodir = self.dname |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
721 | 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
|
722 | 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
|
723 | 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
|
724 | return |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
725 | |
187
d7916a2e31d6
Added some more refinements to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
726 | 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
|
727 | 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
|
728 | self.activateWindow() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
729 | self.raise_() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
730 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
731 | self.logTree.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
732 | self.__started = True |
243
a1d982e68edf
Fixed an issue introduced by the latest change.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
241
diff
changeset
|
733 | self.__identifyProject() |
921
ae00e4fbcec0
Prepared Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
734 | self.__getClosedBranches() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
735 | self.__getLogEntries() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
736 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
737 | def __procFinished(self, exitCode, exitStatus): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
738 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
739 | Private slot connected to the finished signal. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
740 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
741 | @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
|
742 | @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
|
743 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
744 | self.__processBuffer() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
745 | self.__finish() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
746 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
747 | def __finish(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
748 | """ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
749 | 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
|
750 | the button. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
751 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
752 | if self.process is not None and \ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
753 | self.process.state() != QProcess.NotRunning: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
754 | self.process.terminate() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
755 | QTimer.singleShot(2000, self.process.kill) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
756 | self.process.waitForFinished(3000) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
757 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
758 | QApplication.restoreOverrideCursor() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
759 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
760 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
761 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
762 | self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
763 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
764 | self.inputGroup.setEnabled(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
765 | self.inputGroup.hide() |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
766 | self.refreshButton.setEnabled(True) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
767 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
768 | def __processBuffer(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
769 | """ |
198
7ab8e126f404
Fixed a few issues with the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
770 | 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
|
771 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
772 | noEntries = 0 |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
773 | log = {"message": [], "bookmarks": None, "phase": ""} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
774 | 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
|
775 | initialText = True |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
776 | fileCopies = {} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
777 | for s in self.buf: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
778 | if s != "@@@\n": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
779 | try: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
780 | key, value = s.split("|", 1) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
781 | except ValueError: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
782 | key = "" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
783 | value = s |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
784 | 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
|
785 | initialText = False |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
786 | log["revision"] = value.strip() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
787 | elif key == "user": |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
788 | log["author"] = value.strip() |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
789 | elif key == "parents": |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
790 | 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
|
791 | [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
|
792 | for x in value.strip().split()] |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
793 | elif key == "date": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
794 | log["date"] = " ".join(value.strip().split()[:2]) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
795 | elif key == "description": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
796 | log["message"].append(value.strip()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
797 | elif key == "file_adds": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
798 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
799 | 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
|
800 | if f in fileCopies: |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
801 | 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
|
802 | "action": "A", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
803 | "path": f, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
804 | "copyfrom": fileCopies[f], |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
805 | }) |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
806 | else: |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
807 | 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
|
808 | "action": "A", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
809 | "path": f, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
810 | "copyfrom": "", |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
811 | }) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
812 | elif key == "files_mods": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
813 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
814 | 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
|
815 | 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
|
816 | "action": "M", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
817 | "path": f, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
818 | "copyfrom": "", |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
819 | }) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
820 | elif key == "file_dels": |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
821 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
822 | 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
|
823 | 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
|
824 | "action": "D", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
825 | "path": f, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
826 | "copyfrom": "", |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
827 | }) |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
828 | elif key == "file_copies": |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
829 | if value.strip(): |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
830 | 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
|
831 | newName, oldName = entry[:-1].split(" (") |
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
832 | fileCopies[newName] = oldName |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
833 | elif key == "branches": |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
834 | if value.strip(): |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
835 | log["branches"] = value.strip().split(", ") |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
836 | else: |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
837 | log["branches"] = ["default"] |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
838 | elif key == "tags": |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
839 | log["tags"] = value.strip().split(", ") |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
840 | elif key == "bookmarks": |
1019
d8a9697f78d1
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
841 | 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
|
842 | elif key == "phase": |
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
843 | log["phase"] = value.strip() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
844 | 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
|
845 | 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
|
846 | continue |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
847 | if value.strip(): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
848 | log["message"].append(value.strip()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
849 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
850 | if len(log) > 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
|
851 | self.__generateLogItem(log["author"], log["date"], |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
852 | log["message"], log["revision"], changedPaths, |
1061
3e21869872e3
Fixed PEP-8 related issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1019
diff
changeset
|
853 | log["parents"], log["branches"], log["tags"], |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
854 | log["phase"], log["bookmarks"]) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
855 | 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
|
856 | 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
|
857 | not self.__minDate.isValid(): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
858 | self.__maxDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
859 | self.__minDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
860 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
861 | if self.__maxDate < dt: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
862 | self.__maxDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
863 | if self.__minDate > dt: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
864 | self.__minDate = dt |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
865 | noEntries += 1 |
1605
899cb1241de5
Added support for Phases as of Mercurial 2.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
866 | log = {"message": [], "bookmarks": None, "phase": ""} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
867 | changedPaths = [] |
203
0bd3912f3c5f
Refined the Mercurial log browser and log dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
868 | fileCopies = {} |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
869 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
870 | self.__resizeColumnsLog() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
871 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
872 | if self.__started: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
873 | self.logTree.setCurrentItem(self.logTree.topLevelItem(0)) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
874 | self.__started = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
875 | |
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
|
876 | 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
|
877 | 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
|
878 | 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
|
879 | 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
|
880 | 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
|
881 | 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
|
882 | 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
|
883 | 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
|
884 | self.limitSpinBox.setEnabled(False) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
885 | |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
886 | # update the log filters |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
887 | self.__filterLogsEnabled = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
888 | self.fromDate.setMinimumDate(self.__minDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
889 | self.fromDate.setMaximumDate(self.__maxDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
890 | self.fromDate.setDate(self.__minDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
891 | self.toDate.setMinimumDate(self.__minDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
892 | self.toDate.setMaximumDate(self.__maxDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
893 | 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
|
894 | |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
895 | branchFilter = self.branchCombo.currentText() |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
896 | if not branchFilter: |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
897 | branchFilter = self.__allBranchesFilter |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
898 | self.branchCombo.clear() |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
899 | self.branchCombo.addItems( |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
900 | [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
|
901 | self.branchCombo.setCurrentIndex( |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
902 | 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
|
903 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
904 | self.__filterLogsEnabled = True |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
905 | self.__filterLogs() |
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
|
906 | |
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
|
907 | self.__updateDiffButtons() |
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
|
908 | self.__updatePhaseButton() |
2570
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
909 | self.__updateGraftButton() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
910 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
911 | def __readStdout(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
912 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
913 | 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
|
914 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
915 | 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
|
916 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
917 | self.process.setReadChannel(QProcess.StandardOutput) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
918 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
919 | while self.process.canReadLine(): |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
920 | line = str(self.process.readLine(), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
921 | Preferences.getSystem("IOEncoding"), |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
922 | 'replace') |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
923 | self.buf.append(line) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
924 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
925 | def __readStderr(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
926 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
927 | Private slot to handle the readyReadStandardError signal. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
928 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
929 | 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
|
930 | error pane. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
931 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
932 | 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
|
933 | s = str(self.process.readAllStandardError(), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
934 | Preferences.getSystem("IOEncoding"), |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
935 | 'replace') |
1241
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
936 | self.__showError(s) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
937 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
938 | def __showError(self, out): |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
939 | """ |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
940 | 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
|
941 | |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
942 | @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
|
943 | """ |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
944 | self.errorGroup.show() |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
945 | self.errors.insertPlainText(out) |
09c6155ee612
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
946 | self.errors.ensureCursorVisible() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
947 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
948 | def __diffRevisions(self, rev1, rev2): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
949 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
950 | Private method to do a diff of two revisions. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
951 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
952 | @param rev1 first revision number (integer) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
953 | @param rev2 second revision number (integer) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
954 | """ |
1265
22f70d13a41e
Made some window handling smoother.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1264
diff
changeset
|
955 | if self.diff is None: |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
956 | from .HgDiffDialog import HgDiffDialog |
1265
22f70d13a41e
Made some window handling smoother.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1264
diff
changeset
|
957 | self.diff = HgDiffDialog(self.vcs) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
958 | self.diff.show() |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
210
diff
changeset
|
959 | self.diff.start(self.filename, [rev1, rev2], self.bundle) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
960 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
961 | def on_buttonBox_clicked(self, button): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
962 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
963 | 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
|
964 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
965 | @param button button that was clicked (QAbstractButton) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
966 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
967 | if button == self.buttonBox.button(QDialogButtonBox.Close): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
968 | self.close() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
969 | elif button == self.buttonBox.button(QDialogButtonBox.Cancel): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
970 | 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
|
971 | 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
|
972 | 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
|
973 | 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
|
974 | self.__finish() |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
975 | elif button == self.refreshButton: |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
976 | self.on_refreshButton_clicked() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
977 | |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
978 | def __updateDiffButtons(self): |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
979 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
980 | 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
|
981 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
982 | selectionLength = len(self.logTree.selectedItems()) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
983 | if selectionLength <= 1: |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
984 | current = self.logTree.currentItem() |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
985 | if current is None: |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
986 | self.diffP1Button.setEnabled(False) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
987 | self.diffP2Button.setEnabled(False) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
988 | else: |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
989 | parents = current.data(0, self.__parentsRole) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
990 | self.diffP1Button.setEnabled(len(parents) > 0) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
991 | self.diffP2Button.setEnabled(len(parents) > 1) |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
992 | |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
993 | self.diffRevisionsButton.setEnabled(False) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
994 | elif selectionLength == 2: |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
995 | self.diffP1Button.setEnabled(False) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
996 | self.diffP2Button.setEnabled(False) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
997 | |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
998 | self.diffRevisionsButton.setEnabled(True) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
999 | else: |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1000 | self.diffP1Button.setEnabled(False) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1001 | self.diffP2Button.setEnabled(False) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1002 | |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1003 | self.diffRevisionsButton.setEnabled(False) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1004 | |
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
|
1005 | def __updatePhaseButton(self): |
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
|
1006 | """ |
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
|
1007 | Private slot to update the status of the phase button. |
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
|
1008 | """ |
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
|
1009 | if self.initialCommandMode == "log": |
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
|
1010 | # step 1: count entries with changeable phases |
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
|
1011 | secret = 0 |
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
|
1012 | draft = 0 |
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
|
1013 | public = 0 |
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
|
1014 | for itm in self.logTree.selectedItems(): |
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
|
1015 | phase = itm.text(self.PhaseColumn) |
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
|
1016 | if phase == "draft": |
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
|
1017 | draft += 1 |
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
|
1018 | elif phase == "secret": |
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
|
1019 | secret += 1 |
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
|
1020 | else: |
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
|
1021 | public += 1 |
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
|
1022 | |
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
|
1023 | # step 2: set the status of the phase button |
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
|
1024 | if public == 0 and \ |
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
|
1025 | ((secret > 0 and draft == 0) or \ |
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
|
1026 | (secret == 0 and draft > 0)): |
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
|
1027 | self.phaseButton.setEnabled(True) |
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
|
1028 | else: |
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
|
1029 | self.phaseButton.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
|
1030 | else: |
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
|
1031 | self.phaseButton.setEnabled(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
|
1032 | |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1033 | def __updateGraftButton(self): |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1034 | """ |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1035 | Private slot to update the status of the graft button. |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1036 | """ |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1037 | if self.graftButton.isVisible(): |
2570
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1038 | if self.initialCommandMode == "log": |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1039 | # step 1: count selected entries not belonging to the current branch |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1040 | otherBranches = 0 |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1041 | for itm in self.logTree.selectedItems(): |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1042 | branch = itm.text(self.BranchColumn) |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1043 | if branch != self.__projectBranch: |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1044 | otherBranches += 1 |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1045 | |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1046 | # step 2: set the status of the graft button |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1047 | self.graftButton.setEnabled(otherBranches > 0) |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1048 | else: |
a2de94bae41b
Fixed an issue in the Mercurial log browser setting the correct state of the graft button in 'incoming' and 'outgoing' mode.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2569
diff
changeset
|
1049 | self.graftButton.setEnabled(False) |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1050 | |
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
|
1051 | def __updateGui(self, itm): |
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
|
1052 | """ |
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
|
1053 | Private slot to update GUI elements except the diff and phase buttons. |
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
|
1054 | |
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
|
1055 | @param itm reference to the item the update should be based on (QTreeWidgetItem) |
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
|
1056 | """ |
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
|
1057 | self.messageEdit.clear() |
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
|
1058 | self.filesTree.clear() |
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
|
1059 | |
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
|
1060 | if itm is not None: |
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
|
1061 | for line in itm.data(0, self.__messageRole): |
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
|
1062 | self.messageEdit.append(line.strip()) |
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
|
1063 | |
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
|
1064 | 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
|
1065 | 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
|
1066 | for change in changes: |
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
|
1067 | self.__generateFileItem( |
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
|
1068 | change["action"], change["path"], change["copyfrom"]) |
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
|
1069 | self.__resizeColumnsFiles() |
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
|
1070 | self.__resortFiles() |
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
|
1071 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1072 | @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1073 | def on_logTree_currentItemChanged(self, current, previous): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1074 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1075 | 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
|
1076 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1077 | @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
|
1078 | @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
|
1079 | """ |
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
|
1080 | self.__updateGui(current) |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1081 | self.__updateDiffButtons() |
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
|
1082 | self.__updatePhaseButton() |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1083 | self.__updateGraftButton() |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1084 | |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1085 | @pyqtSlot() |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1086 | def on_logTree_itemSelectionChanged(self): |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1087 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1088 | 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
|
1089 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1090 | if len(self.logTree.selectedItems()) == 1: |
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
|
1091 | self.__updateGui(self.logTree.selectedItems()[0]) |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1092 | |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1093 | self.__updateDiffButtons() |
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
|
1094 | self.__updatePhaseButton() |
2543
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1095 | self.__updateGraftButton() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1096 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1097 | @pyqtSlot() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1098 | def on_nextButton_clicked(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1099 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1100 | Private slot to handle the Next button. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1101 | """ |
784
3893c2537fb4
Fixed a little bug in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
783
diff
changeset
|
1102 | if self.__lastRev > 0: |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1103 | self.__getLogEntries(self.__lastRev - 1) |
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 | @pyqtSlot() |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1106 | def on_diffP1Button_clicked(self): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1107 | """ |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1108 | Private slot to handle the Diff to Parent 1 button. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1109 | """ |
2567
f70f3103c927
Fixed a severe issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2544
diff
changeset
|
1110 | if len(self.logTree.selectedItems()): |
f70f3103c927
Fixed a severe issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2544
diff
changeset
|
1111 | itm = self.logTree.selectedItems()[0] |
f70f3103c927
Fixed a severe issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2544
diff
changeset
|
1112 | else: |
f70f3103c927
Fixed a severe issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2544
diff
changeset
|
1113 | itm = self.logTree.currentItem() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1114 | if itm is None: |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1115 | self.diffP1Button.setEnabled(False) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1116 | return |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1117 | rev2 = int(itm.text(self.RevisionColumn).split(":")[0]) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
1118 | |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
1119 | rev1 = itm.data(0, self.__parentsRole)[0] |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
1120 | if rev1 < 0: |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1121 | self.diffP1Button.setEnabled(False) |
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1122 | return |
178
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 | self.__diffRevisions(rev1, rev2) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1125 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1126 | @pyqtSlot() |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
1127 | def on_diffP2Button_clicked(self): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1128 | """ |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1129 | Private slot to handle the Diff to Parent 2 button. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1130 | """ |
2567
f70f3103c927
Fixed a severe issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2544
diff
changeset
|
1131 | if len(self.logTree.selectedItems()): |
f70f3103c927
Fixed a severe issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2544
diff
changeset
|
1132 | itm = self.logTree.selectedItems()[0] |
f70f3103c927
Fixed a severe issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2544
diff
changeset
|
1133 | else: |
f70f3103c927
Fixed a severe issue in the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2544
diff
changeset
|
1134 | itm = self.logTree.currentItem() |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1135 | if itm is None: |
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1136 | self.diffP2Button.setEnabled(False) |
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1137 | return |
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1138 | rev2 = int(itm.text(self.RevisionColumn).split(":")[0]) |
210
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
1139 | |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
1140 | rev1 = itm.data(0, self.__parentsRole)[1] |
b1a204f22291
Fixed a few issues with the Mercurial log dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
208
diff
changeset
|
1141 | if rev1 < 0: |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1142 | self.diffP2Button.setEnabled(False) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1143 | return |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1144 | |
208
26ed553ad4fb
Corrected the diff functions of the log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
207
diff
changeset
|
1145 | self.__diffRevisions(rev1, rev2) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1146 | |
235
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1147 | @pyqtSlot() |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1148 | def on_diffRevisionsButton_clicked(self): |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1149 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1150 | Private slot to handle the Compare Revisions button. |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1151 | """ |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1152 | items = self.logTree.selectedItems() |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1153 | |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1154 | rev2 = int(items[0].text(self.RevisionColumn).split(":")[0]) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1155 | rev1 = int(items[1].text(self.RevisionColumn).split(":")[0]) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1156 | |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1157 | self.__diffRevisions(min(rev1, rev2), max(rev1, rev2)) |
7cb9905b0cf9
Little enhancement to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
215
diff
changeset
|
1158 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1159 | @pyqtSlot(QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1160 | def on_fromDate_dateChanged(self, date): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1161 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1162 | 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
|
1163 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1164 | @param date new date (QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1165 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1166 | self.__filterLogs() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1167 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1168 | @pyqtSlot(QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1169 | def on_toDate_dateChanged(self, date): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1170 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1171 | 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
|
1172 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1173 | @param date new date (QDate) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1174 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1175 | self.__filterLogs() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1176 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1177 | @pyqtSlot(str) |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1178 | 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
|
1179 | """ |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1180 | 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
|
1181 | |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1182 | @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
|
1183 | """ |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1184 | self.__filterLogs() |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1185 | |
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1186 | @pyqtSlot(str) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1187 | def on_fieldCombo_activated(self, txt): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1188 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1189 | 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
|
1190 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1191 | @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
|
1192 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1193 | self.__filterLogs() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1194 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1195 | @pyqtSlot(str) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1196 | def on_rxEdit_textChanged(self, txt): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1197 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1198 | 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
|
1199 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1200 | @param txt filter expression (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1201 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1202 | self.__filterLogs() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1203 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1204 | def __filterLogs(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1205 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1206 | Private method to filter the log entries. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1207 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1208 | if self.__filterLogsEnabled: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1209 | 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
|
1210 | 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
|
1211 | 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
|
1212 | closedBranch = branch + '--' |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1213 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1214 | txt = self.fieldCombo.currentText() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1215 | if txt == self.trUtf8("Author"): |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1216 | fieldIndex = self.AuthorColumn |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1217 | searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1218 | elif txt == self.trUtf8("Revision"): |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1219 | fieldIndex = self.RevisionColumn |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1220 | txt = self.rxEdit.text() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1221 | if txt.startswith("^"): |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1222 | searchRx = QRegExp("^\s*{0}".format(txt[1:]), |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1223 | Qt.CaseInsensitive) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1224 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1225 | searchRx = QRegExp(txt, Qt.CaseInsensitive) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1226 | else: |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1227 | fieldIndex = self.MessageColumn |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1228 | searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1229 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1230 | currentItem = self.logTree.currentItem() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1231 | for topIndex in range(self.logTree.topLevelItemCount()): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1232 | topItem = self.logTree.topLevelItem(topIndex) |
180
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1233 | if topItem.text(self.DateColumn) <= to_ and \ |
40ac468c2558
Enhanced LogBrowserDialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1234 | topItem.text(self.DateColumn) >= from_ and \ |
316
b7e499650928
Added a branch filter to the Mercurial log browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
296
diff
changeset
|
1235 | (branch == self.__allBranchesFilter or \ |
932
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1236 | topItem.text(self.BranchColumn) in \ |
efd23a913a09
Finished extending the Mercurial log browser to indicate closed branches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
921
diff
changeset
|
1237 | [branch, closedBranch]) and \ |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1238 | searchRx.indexIn(topItem.text(fieldIndex)) > -1: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1239 | topItem.setHidden(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1240 | if topItem is currentItem: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1241 | self.on_logTree_currentItemChanged(topItem, None) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1242 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1243 | topItem.setHidden(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1244 | if topItem is currentItem: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1245 | self.messageEdit.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1246 | self.filesTree.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1247 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1248 | @pyqtSlot(bool) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1249 | def on_stopCheckBox_clicked(self, checked): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1250 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1251 | Private slot called, when the stop on copy/move checkbox is clicked |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1252 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
932
diff
changeset
|
1253 | self.vcs.getPlugin().setPreferences("StopLogOnCopy", |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1254 | self.stopCheckBox.isChecked()) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1255 | self.nextButton.setEnabled(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1256 | self.limitSpinBox.setEnabled(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1257 | |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1258 | @pyqtSlot() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1259 | def on_refreshButton_clicked(self): |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1260 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1261 | Private slot to refresh the log. |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1262 | """ |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1263 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1264 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1265 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1266 | |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1267 | self.inputGroup.setEnabled(True) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1268 | self.inputGroup.show() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1269 | self.refreshButton.setEnabled(False) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1270 | |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1271 | self.__initData() |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1272 | |
1264
da42fd833a66
Fixed a little bug in the Mercurial log browser window.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1263
diff
changeset
|
1273 | self.commandMode = self.initialCommandMode |
1086
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1274 | self.start(self.filename) |
b48ce064b224
Enhanced the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1275 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1276 | def on_passwordCheckBox_toggled(self, isOn): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1277 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1278 | 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
|
1279 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1280 | @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
|
1281 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1282 | if isOn: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1283 | self.input.setEchoMode(QLineEdit.Password) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1284 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1285 | self.input.setEchoMode(QLineEdit.Normal) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1286 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1287 | @pyqtSlot() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1288 | def on_sendButton_clicked(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1289 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1290 | Private slot to send the input to the merurial process. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1291 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1292 | input = self.input.text() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1293 | input += os.linesep |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1294 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1295 | if self.passwordCheckBox.isChecked(): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1296 | self.errors.insertPlainText(os.linesep) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1297 | self.errors.ensureCursorVisible() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1298 | else: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1299 | self.errors.insertPlainText(input) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1300 | self.errors.ensureCursorVisible() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1301 | self.errorGroup.show() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1302 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1303 | self.process.write(input) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1304 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1305 | self.passwordCheckBox.setChecked(False) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1306 | self.input.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1307 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1308 | def on_input_returnPressed(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1309 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1310 | 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
|
1311 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1312 | self.intercept = True |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1313 | self.on_sendButton_clicked() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1314 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1315 | def keyPressEvent(self, evt): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1316 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1317 | 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
|
1318 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1319 | @param evt the key press event (QKeyEvent) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1320 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1321 | if self.intercept: |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1322 | self.intercept = False |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1323 | evt.accept() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1324 | return |
1131
7781e396c903
Changed the code to use super() to access the superclass.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1086
diff
changeset
|
1325 | super().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
|
1326 | |
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
|
1327 | @pyqtSlot() |
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
|
1328 | def on_phaseButton_clicked(self): |
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
|
1329 | """ |
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
|
1330 | Private slot to handle the Change Phase button. |
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
|
1331 | """ |
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
|
1332 | 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
|
1333 | 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
|
1334 | 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
|
1335 | if itm.text(self.PhaseColumn) == currentPhase: |
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
|
1336 | revs.append(itm.text(self.RevisionColumn).split(":")[0].strip()) |
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
|
1337 | |
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
|
1338 | if not 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
|
1339 | self.phaseButton.setEnabled(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
|
1340 | 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
|
1341 | |
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
|
1342 | if currentPhase == "draft": |
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
|
1343 | newPhase = "secret" |
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
|
1344 | 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
|
1345 | else: |
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
|
1346 | newPhase = "draft" |
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
|
1347 | 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
|
1348 | 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
|
1349 | 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
|
1350 | 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
|
1351 | 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
|
1352 | |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1353 | @pyqtSlot() |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1354 | def on_graftButton_clicked(self): |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1355 | """ |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1356 | Private slot to handle the Copy Changesets button. |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1357 | """ |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1358 | revs = [] |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1359 | |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1360 | 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
|
1361 | 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
|
1362 | if branch != self.__projectBranch: |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1363 | revs.append(itm.text(self.RevisionColumn).strip().split(":", 1)[0]) |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1364 | |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1365 | if revs: |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1366 | 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
|
1367 | if shouldReopen: |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1368 | res = E5MessageBox.yesNo(None, |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1369 | self.trUtf8("Copy Changesets"), |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1370 | self.trUtf8("""The project should be reread. Do this now?"""), |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1371 | yesDefault=True) |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1372 | if res: |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1373 | e5App().getObject("Project").reopenProject() |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1374 | else: |
eb9472947653
Added a 'Copy Changesets' button to the Mercurial log browser dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2444
diff
changeset
|
1375 | self.on_refreshButton_clicked() |