Sat, 11 Jan 2014 11:55:33 +0100
Changed the code to use QObject.tr() instead of QObject.trUtf8().
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
3160
209a07d7e401
Updated copyright for 2014.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3036
diff
changeset
|
3 | # Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the transplant extension project helper. |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | from PyQt4.QtGui import QMenu |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | from E5Gui.E5Action import E5Action |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | from E5Gui import E5MessageBox |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | |
1087
fb8cd56819a9
Changed the Mercurial extension interface code to use custom base classes instead of inheriting QObject directly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
15 | from ..HgExtensionProjectHelper import HgExtensionProjectHelper |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | |
1090
41b2f212563c
Added an icon for the transplant action.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
17 | import UI.PixmapCache |
41b2f212563c
Added an icon for the transplant action.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
18 | |
1087
fb8cd56819a9
Changed the Mercurial extension interface code to use custom base classes instead of inheriting QObject directly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
19 | |
fb8cd56819a9
Changed the Mercurial extension interface code to use custom base classes instead of inheriting QObject directly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
20 | class TransplantProjectHelper(HgExtensionProjectHelper): |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | Class implementing the transplant extension project helper. |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | def __init__(self): |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | Constructor |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | """ |
1087
fb8cd56819a9
Changed the Mercurial extension interface code to use custom base classes instead of inheriting QObject directly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
28 | super().__init__() |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | |
1992
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
30 | def setObjects(self, vcsObject, projectObject): |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
31 | """ |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
32 | Public method to set references to the vcs and project objects. |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
33 | |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
34 | @param vcsObject reference to the vcs object |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
35 | @param projectObject reference to the project object |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
36 | """ |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
37 | super().setObjects(vcsObject, projectObject) |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
38 | |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
39 | if self.vcs.version >= (2, 3): |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
40 | # transplant is deprecated as of Mercurial 2.3 |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
41 | for act in self.actions: |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
42 | act.setEnabled(False) |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
43 | |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | def initActions(self): |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | Public method to generate the action objects. |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | """ |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
48 | self.hgTransplantAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
49 | self.tr('Transplant Changesets'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
50 | UI.PixmapCache.getIcon("vcsTransplant.png"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
51 | self.tr('Transplant Changesets'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
52 | 0, 0, self, 'mercurial_transplant') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
53 | self.hgTransplantAct.setStatusTip(self.tr( |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | 'Transplant changesets from another branch' |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
56 | self.hgTransplantAct.setWhatsThis(self.tr( |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | """<b>Transplant Changesets</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
58 | """<p>This transplants changesets from another branch on top""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
59 | """ of the current working directory with the log of the""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
60 | """ original changeset.</p>""" |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | )) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | self.hgTransplantAct.triggered[()].connect(self.__hgTransplant) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | self.actions.append(self.hgTransplantAct) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | self.hgTransplantContinueAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
66 | self.tr('Continue Transplant Session'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
67 | self.tr('Continue Transplant Session'), |
3036
30c81c9e88b8
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
68 | 0, 0, self, 'mercurial_transplant_continue') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
69 | self.hgTransplantContinueAct.setStatusTip(self.tr( |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | 'Continue the last transplant session after repair' |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
72 | self.hgTransplantContinueAct.setWhatsThis(self.tr( |
1092
1b149c2d9ae1
Some small tweaks to the transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1090
diff
changeset
|
73 | """<b>Continue Transplant Session</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
74 | """<p>This continues the last transplant session after""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
75 | """ repair.</p>""" |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | )) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
77 | self.hgTransplantContinueAct.triggered[()].connect( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
78 | self.__hgTransplantContinue) |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | self.actions.append(self.hgTransplantContinueAct) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
80 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
81 | def initMenu(self, mainMenu): |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | Public method to generate the extension menu. |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | @param mainMenu reference to the main menu (QMenu) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | @return populated menu (QMenu) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | menu = QMenu(self.menuTitle(), mainMenu) |
1106
3e57cd52e0f6
Added icons to the Mercurial extensions menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1092
diff
changeset
|
89 | menu.setIcon(UI.PixmapCache.getIcon("vcsTransplant.png")) |
1992
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
90 | if self.vcs.version >= (2, 3): |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
91 | # transplant is deprecated as of Mercurial 2.3 |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
92 | menu.addAction( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
93 | self.tr("Transplant is deprecated")).setEnabled(False) |
1992
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
94 | else: |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
95 | menu.setTearOffEnabled(True) |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
96 | |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
97 | menu.addAction(self.hgTransplantAct) |
f0c5ed503bbd
A few more changes dealing with the deprecated Transplant extension for Mercurial.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
98 | menu.addAction(self.hgTransplantContinueAct) |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
100 | return menu |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | def menuTitle(self): |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | Public method to get the menu title. |
1087
fb8cd56819a9
Changed the Mercurial extension interface code to use custom base classes instead of inheriting QObject directly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
105 | |
fb8cd56819a9
Changed the Mercurial extension interface code to use custom base classes instead of inheriting QObject directly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
106 | @return title of the menu (string) |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | """ |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
108 | return self.tr("Transplant") |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
109 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | def __hgTransplant(self): |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | Private slot used to transplant changesets from another branch. |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | shouldReopen = self.vcs.getExtensionObject("transplant")\ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | .hgTransplant(self.project.getProjectPath()) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | if shouldReopen: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
117 | res = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
118 | None, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
119 | self.tr("Transplant Changesets"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
120 | self.tr("""The project should be reread. Do this now?"""), |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | yesDefault=True) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
122 | if res: |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | self.project.reopenProject() |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
125 | def __hgTransplantContinue(self): |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | Private slot used to continue the last transplant session after repair. |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | """ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | shouldReopen = self.vcs.getExtensionObject("transplant")\ |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | .hgTransplantContinue(self.project.getProjectPath()) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | if shouldReopen: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
132 | res = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
133 | None, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
134 | self.tr("Transplant Changesets (Continue)"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
135 | self.tr("""The project should be reread. Do this now?"""), |
1078
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
136 | yesDefault=True) |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
137 | if res: |
aeee8401e2ce
Added support for the Mercurial transplant extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
138 | self.project.reopenProject() |