Sun, 16 May 2021 20:07:24 +0200
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
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 | |
7923
91e843545d9a
Updated copyright for 2021.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
3 | # Copyright (c) 2010 - 2021 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 the VCS project helper for Mercurial. |
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 | |
8318
962bce857696
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
12 | from PyQt6.QtWidgets import QMenu, QToolBar |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | |
660
7a1d92437921
Added code to check, if a pull --update modified the project structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
467
diff
changeset
|
14 | from E5Gui import E5MessageBox |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | from E5Gui.E5Application import e5App |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | from VCS.ProjectHelper import VcsProjectHelper |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | from E5Gui.E5Action import E5Action |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | import UI.PixmapCache |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | import Preferences |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
24 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | class HgProjectHelper(VcsProjectHelper): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | Class implementing the VCS project helper for Mercurial. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
29 | def __init__(self, vcsObject, projectObject, parent=None, name=None): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | Constructor |
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 | @param vcsObject reference to the vcs object |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | @param projectObject reference to the project object |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | @param parent parent widget (QWidget) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | @param name name of this object (string) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | VcsProjectHelper.__init__(self, vcsObject, projectObject, parent, name) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
39 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
40 | # instantiate the extensions |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
41 | from .QueuesExtension.ProjectHelper import QueuesProjectHelper |
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
42 | from .PurgeExtension.ProjectHelper import PurgeProjectHelper |
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
43 | from .GpgExtension.ProjectHelper import GpgProjectHelper |
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
44 | from .RebaseExtension.ProjectHelper import RebaseProjectHelper |
3290
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3277
diff
changeset
|
45 | from .ShelveExtension.ProjectHelper import ShelveProjectHelper |
3310
a2032ed66aec
Started implementing the Mercurial lfconvert functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
46 | from .LargefilesExtension.ProjectHelper import LargefilesProjectHelper |
5268
748e4c50523b
Added support for the Mercurial strip extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5199
diff
changeset
|
47 | from .StripExtension.ProjectHelper import StripProjectHelper |
5283
06423d65a2b8
Added support for the Mercurial histedit extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5268
diff
changeset
|
48 | from .HisteditExtension.ProjectHelper import HisteditProjectHelper |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6985
diff
changeset
|
49 | from .CloseheadExtension.ProjectHelper import CloseheadProjectHelper |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
50 | self.__extensions = { |
1061
3e21869872e3
Fixed PEP-8 related issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
51 | "mq": QueuesProjectHelper(), |
1071
ac0f74c0b870
Added support for the Mercurial purge extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1066
diff
changeset
|
52 | "purge": PurgeProjectHelper(), |
1075
75bfe8bd4243
Added support for the Mercurial gpg extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1074
diff
changeset
|
53 | "gpg": GpgProjectHelper(), |
1093
47bc4ef30315
Added support for the Mercurial rebase extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1088
diff
changeset
|
54 | "rebase": RebaseProjectHelper(), |
3290
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3277
diff
changeset
|
55 | "shelve": ShelveProjectHelper(), |
3310
a2032ed66aec
Started implementing the Mercurial lfconvert functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3302
diff
changeset
|
56 | "largefiles": LargefilesProjectHelper(), |
5268
748e4c50523b
Added support for the Mercurial strip extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5199
diff
changeset
|
57 | "strip": StripProjectHelper(), |
5283
06423d65a2b8
Added support for the Mercurial histedit extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5268
diff
changeset
|
58 | "histedit": HisteditProjectHelper(), |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6985
diff
changeset
|
59 | "closehead": CloseheadProjectHelper(), |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
60 | } |
1071
ac0f74c0b870
Added support for the Mercurial purge extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1066
diff
changeset
|
61 | |
1074
ed2585464f12
Changed the logic of the Mercurials extension menu creation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1073
diff
changeset
|
62 | self.__extensionMenuTitles = {} |
ed2585464f12
Changed the logic of the Mercurials extension menu creation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1073
diff
changeset
|
63 | for extension in self.__extensions: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
64 | self.__extensionMenuTitles[ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
65 | self.__extensions[extension].menuTitle()] = extension |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
66 | |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
67 | self.__toolbarManager = None |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
68 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
69 | def setObjects(self, vcsObject, projectObject): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
70 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
71 | Public method to set references to the vcs and project objects. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
72 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
73 | @param vcsObject reference to the vcs object |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
74 | @param projectObject reference to the project object |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
75 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
76 | self.vcs = vcsObject |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
77 | self.project = projectObject |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
78 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
79 | for extension in self.__extensions.values(): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
80 | extension.setObjects(vcsObject, projectObject) |
3416
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
81 | |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
82 | self.vcs.iniFileChanged.connect(self.__checkActions) |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
83 | |
8108
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
84 | # add Mercurial version dependent actions here |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
85 | title = self.__toolbar.windowTitle() |
8108
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
86 | if self.vcs.version >= (5, 7): |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
87 | self.actions.append(self.hgBookmarkPushAllAct) |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
88 | self.__toolbarManager.addAction(self.hgBookmarkPushAllAct, title) |
6467
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
89 | |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
90 | if self.vcs.version < (4, 7, 0): |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
91 | self.hgGraftStopAct.setEnabled(False) |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
92 | self.hgGraftAbortAct.setEnabled(False) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | |
1905
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
94 | def getProject(self): |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
95 | """ |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
96 | Public method to get a reference to the project object. |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
97 | |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
98 | @return reference to the project object (Project) |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
99 | """ |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
100 | return self.project |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
101 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | def getActions(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | Public method to get a list of all actions. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
105 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | @return list of all actions (list of E5Action) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | """ |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
108 | actions = self.actions[:] |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
109 | for extension in self.__extensions.values(): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
110 | actions.extend(extension.getActions()) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
111 | return actions |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | def initActions(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | Public method to generate the action objects. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | """ |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
117 | self.vcsNewAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
118 | self.tr('New from repository'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
119 | UI.PixmapCache.getIcon("vcsCheckout"), |
3190
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('&New from repository...'), 0, 0, |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
121 | self, 'mercurial_new') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
122 | self.vcsNewAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | 'Create (clone) a new project from a Mercurial repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
125 | self.vcsNewAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | """<b>New from repository</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | """<p>This creates (clones) a new local project from """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | """a Mercurial repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
130 | self.vcsNewAct.triggered.connect(self._vcsCheckout) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | self.actions.append(self.vcsNewAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
133 | self.hgIncomingAct = E5Action( |
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('Show incoming log'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
135 | UI.PixmapCache.getIcon("vcsUpdate"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
136 | self.tr('Show incoming log'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
137 | 0, 0, self, 'mercurial_incoming') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
138 | self.hgIncomingAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
139 | 'Show the log of incoming changes' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
140 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
141 | self.hgIncomingAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | """<b>Show incoming log</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
143 | """<p>This shows the log of changes coming into the""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
144 | """ repository.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
145 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
146 | self.hgIncomingAct.triggered.connect(self.__hgIncoming) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
147 | self.actions.append(self.hgIncomingAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
148 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
149 | self.hgPullAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
150 | self.tr('Pull changes'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
151 | UI.PixmapCache.getIcon("vcsUpdate"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
152 | self.tr('Pull changes'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
153 | 0, 0, self, 'mercurial_pull') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
154 | self.hgPullAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
155 | 'Pull changes from a remote repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
156 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
157 | self.hgPullAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
158 | """<b>Pull changes</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
159 | """<p>This pulls changes from a remote repository into the """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | """local repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
162 | self.hgPullAct.triggered.connect(self.__hgPull) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
163 | self.actions.append(self.hgPullAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
165 | self.vcsUpdateAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
166 | self.tr('Update from repository'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
167 | UI.PixmapCache.getIcon("vcsUpdate"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
168 | self.tr('&Update from repository'), 0, 0, self, |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
169 | 'mercurial_update') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
170 | self.vcsUpdateAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | 'Update the local project from the Mercurial repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
173 | self.vcsUpdateAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | """<b>Update from repository</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
175 | """<p>This updates the local project from the Mercurial""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
176 | """ repository.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
177 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
178 | self.vcsUpdateAct.triggered.connect(self._vcsUpdate) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
179 | self.actions.append(self.vcsUpdateAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
181 | self.vcsCommitAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
182 | self.tr('Commit changes to repository'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
183 | UI.PixmapCache.getIcon("vcsCommit"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
184 | self.tr('&Commit changes to repository...'), 0, 0, self, |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
185 | 'mercurial_commit') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
186 | self.vcsCommitAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
187 | 'Commit changes to the local project to the Mercurial repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
188 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
189 | self.vcsCommitAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | """<b>Commit changes to repository</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | """<p>This commits changes to the local project to the """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | """Mercurial repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
194 | self.vcsCommitAct.triggered.connect(self._vcsCommit) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | self.actions.append(self.vcsCommitAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
197 | self.hgOutgoingAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
198 | self.tr('Show outgoing log'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
199 | UI.PixmapCache.getIcon("vcsCommit"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
200 | self.tr('Show outgoing log'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
201 | 0, 0, self, 'mercurial_outgoing') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
202 | self.hgOutgoingAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
203 | 'Show the log of outgoing changes' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
204 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
205 | self.hgOutgoingAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | """<b>Show outgoing log</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
207 | """<p>This shows the log of changes outgoing out of the""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
208 | """ repository.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
210 | self.hgOutgoingAct.triggered.connect(self.__hgOutgoing) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
211 | self.actions.append(self.hgOutgoingAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
212 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
213 | self.hgPushAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
214 | self.tr('Push changes'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
215 | UI.PixmapCache.getIcon("vcsCommit"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
216 | self.tr('Push changes'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
217 | 0, 0, self, 'mercurial_push') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
218 | self.hgPushAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
219 | 'Push changes to a remote repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
220 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
221 | self.hgPushAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | """<b>Push changes</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | """<p>This pushes changes from the local repository to a """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | """remote repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
226 | self.hgPushAct.triggered.connect(self.__hgPush) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
227 | self.actions.append(self.hgPushAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
228 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
229 | self.hgPushForcedAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
230 | self.tr('Push changes (force)'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
231 | UI.PixmapCache.getIcon("vcsCommit"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
232 | self.tr('Push changes (force)'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
233 | 0, 0, self, 'mercurial_push_forced') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
234 | self.hgPushForcedAct.setStatusTip(self.tr( |
276
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
235 | 'Push changes to a remote repository with force option' |
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
236 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
237 | self.hgPushForcedAct.setWhatsThis(self.tr( |
276
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
238 | """<b>Push changes (force)</b>""" |
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
239 | """<p>This pushes changes from the local repository to a """ |
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
240 | """remote repository using the 'force' option.</p>""" |
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
241 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
242 | self.hgPushForcedAct.triggered.connect(self.__hgPushForced) |
276
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
243 | self.actions.append(self.hgPushForcedAct) |
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
244 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
245 | self.vcsExportAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
246 | self.tr('Export from repository'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
247 | UI.PixmapCache.getIcon("vcsExport"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
248 | self.tr('&Export from repository...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
249 | 0, 0, self, 'mercurial_export_repo') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
250 | self.vcsExportAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
251 | 'Export a project from the repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
252 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
253 | self.vcsExportAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
254 | """<b>Export from repository</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
255 | """<p>This exports a project from the repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
256 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
257 | self.vcsExportAct.triggered.connect(self._vcsExport) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
258 | self.actions.append(self.vcsExportAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
259 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
260 | self.hgLogBrowserAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
261 | self.tr('Show log browser'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
262 | UI.PixmapCache.getIcon("vcsLog"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
263 | self.tr('Show log browser'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
264 | 0, 0, self, 'mercurial_log_browser') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
265 | self.hgLogBrowserAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
266 | 'Show a dialog to browse the log of the local project' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
268 | self.hgLogBrowserAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
269 | """<b>Show log browser</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
270 | """<p>This shows a dialog to browse the log of the local""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
271 | """ project. A limited number of entries is shown first.""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
272 | """ More can be retrieved later on.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
273 | )) |
3349
2a034a7f1f54
Made the status LED (right lower corner) clickable (depending on overall VCS status it will show the log browser or the status dialog).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3345
diff
changeset
|
274 | self.hgLogBrowserAct.triggered.connect(self._vcsLogBrowser) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
275 | self.actions.append(self.hgLogBrowserAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
276 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
277 | self.vcsDiffAct = E5Action( |
3471
31a6d4300906
Corrected some inconsitencies.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3434
diff
changeset
|
278 | self.tr('Show differences'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
279 | UI.PixmapCache.getIcon("vcsDiff"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
280 | self.tr('Show &difference'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
281 | 0, 0, self, 'mercurial_diff') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
282 | self.vcsDiffAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
283 | 'Show the difference of the local project to the repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
284 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
285 | self.vcsDiffAct.setWhatsThis(self.tr( |
3471
31a6d4300906
Corrected some inconsitencies.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3434
diff
changeset
|
286 | """<b>Show differences</b>""" |
3472
9ea593813385
Corrected some more inconsitencies.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3471
diff
changeset
|
287 | """<p>This shows differences of the local project to the""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
288 | """ repository.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
289 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
290 | self.vcsDiffAct.triggered.connect(self._vcsDiff) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | self.actions.append(self.vcsDiffAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
292 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
293 | self.hgExtDiffAct = E5Action( |
3471
31a6d4300906
Corrected some inconsitencies.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3434
diff
changeset
|
294 | self.tr('Show differences (extended)'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
295 | UI.PixmapCache.getIcon("vcsDiff"), |
3471
31a6d4300906
Corrected some inconsitencies.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3434
diff
changeset
|
296 | self.tr('Show differences (extended)'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
297 | 0, 0, self, 'mercurial_extendeddiff') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
298 | self.hgExtDiffAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
299 | 'Show the difference of revisions of the project to the repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
301 | self.hgExtDiffAct.setWhatsThis(self.tr( |
3471
31a6d4300906
Corrected some inconsitencies.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3434
diff
changeset
|
302 | """<b>Show differences (extended)</b>""" |
3472
9ea593813385
Corrected some more inconsitencies.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3471
diff
changeset
|
303 | """<p>This shows differences of selectable revisions of the""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
304 | """ project.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
305 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
306 | self.hgExtDiffAct.triggered.connect(self.__hgExtendedDiff) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
307 | self.actions.append(self.hgExtDiffAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
308 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
309 | self.vcsStatusAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
310 | self.tr('Show status'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
311 | UI.PixmapCache.getIcon("vcsStatus"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
312 | self.tr('Show &status...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
313 | 0, 0, self, 'mercurial_status') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
314 | self.vcsStatusAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
315 | 'Show the status of the local project' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
316 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
317 | self.vcsStatusAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
318 | """<b>Show status</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
319 | """<p>This shows the status of the local project.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
320 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
321 | self.vcsStatusAct.triggered.connect(self._vcsStatus) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
322 | self.actions.append(self.vcsStatusAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
323 | |
2811
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
324 | self.hgSummaryAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
325 | self.tr('Show Summary'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
326 | UI.PixmapCache.getIcon("vcsSummary"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
327 | self.tr('Show summary...'), |
3036
30c81c9e88b8
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
328 | 0, 0, self, 'mercurial_summary') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
329 | self.hgSummaryAct.setStatusTip(self.tr( |
2811
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
330 | 'Show summary information of the working directory status' |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
331 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
332 | self.hgSummaryAct.setWhatsThis(self.tr( |
2811
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
333 | """<b>Show summary</b>""" |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
334 | """<p>This shows some summary information of the working""" |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
335 | """ directory status.</p>""" |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
336 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
337 | self.hgSummaryAct.triggered.connect(self.__hgSummary) |
2811
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
338 | self.actions.append(self.hgSummaryAct) |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
339 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
340 | self.hgHeadsAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
341 | self.tr('Show heads'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
342 | self.tr('Show heads'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
343 | 0, 0, self, 'mercurial_heads') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
344 | self.hgHeadsAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
345 | 'Show the heads of the repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
346 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
347 | self.hgHeadsAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
348 | """<b>Show heads</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
349 | """<p>This shows the heads of the repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
350 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
351 | self.hgHeadsAct.triggered.connect(self.__hgHeads) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
352 | self.actions.append(self.hgHeadsAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
353 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
354 | self.hgParentsAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
355 | self.tr('Show parents'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
356 | self.tr('Show parents'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
357 | 0, 0, self, 'mercurial_parents') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
358 | self.hgParentsAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
359 | 'Show the parents of the repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
360 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
361 | self.hgParentsAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
362 | """<b>Show parents</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
363 | """<p>This shows the parents of the repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
364 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
365 | self.hgParentsAct.triggered.connect(self.__hgParents) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
366 | self.actions.append(self.hgParentsAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
367 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
368 | self.hgTipAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
369 | self.tr('Show tip'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
370 | self.tr('Show tip'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
371 | 0, 0, self, 'mercurial_tip') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
372 | self.hgTipAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
373 | 'Show the tip of the repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
374 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
375 | self.hgTipAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
376 | """<b>Show tip</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
377 | """<p>This shows the tip of the repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
378 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
379 | self.hgTipAct.triggered.connect(self.__hgTip) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
380 | self.actions.append(self.hgTipAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
381 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
382 | self.vcsRevertAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
383 | self.tr('Revert changes'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
384 | UI.PixmapCache.getIcon("vcsRevert"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
385 | self.tr('Re&vert changes'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
386 | 0, 0, self, 'mercurial_revert') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
387 | self.vcsRevertAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
388 | 'Revert all changes made to the local project' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
389 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
390 | self.vcsRevertAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
391 | """<b>Revert changes</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
392 | """<p>This reverts all changes made to the local project.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
393 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
394 | self.vcsRevertAct.triggered.connect(self.__hgRevert) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
395 | self.actions.append(self.vcsRevertAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
396 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
397 | self.vcsMergeAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
398 | self.tr('Merge'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
399 | UI.PixmapCache.getIcon("vcsMerge"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
400 | self.tr('Mer&ge changes...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
401 | 0, 0, self, 'mercurial_merge') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
402 | self.vcsMergeAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
403 | 'Merge changes of a revision into the local project' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
404 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
405 | self.vcsMergeAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
406 | """<b>Merge</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
407 | """<p>This merges changes of a revision into the local""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
408 | """ project.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
409 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
410 | self.vcsMergeAct.triggered.connect(self._vcsMerge) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
411 | self.actions.append(self.vcsMergeAct) |
1879
194a055fff04
Added a few TODOs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1655
diff
changeset
|
412 | |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
413 | self.hgCommitMergeAct = E5Action( |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
414 | self.tr('Commit Merge'), |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
415 | self.tr('Commit Merge'), |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
416 | 0, 0, self, 'mercurial_commit_merge') |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
417 | self.hgCommitMergeAct.setStatusTip(self.tr( |
7183
4ac1c9daa90b
HgStatusDialog: commitMerge and abortMerge actions added
Christos Sevastiadis <csevast@gmail.com>
parents:
7155
diff
changeset
|
418 | 'Commit all the merged changes.' |
7155
334c7d0b5036
Fixed a few code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7152
diff
changeset
|
419 | )) |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
420 | self.hgCommitMergeAct.setWhatsThis(self.tr( |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
421 | """<b>Commit a merge</b>""" |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
422 | """<p>This commits a merge working directory</p>""" |
7155
334c7d0b5036
Fixed a few code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7152
diff
changeset
|
423 | )) |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
424 | self.hgCommitMergeAct.triggered.connect(self.__hgCommitMerge) |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
425 | self.actions.append(self.hgCommitMergeAct) |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
426 | |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
427 | self.hgAbortMergeAct = E5Action( |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
428 | self.tr('Abort Merge'), |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
429 | self.tr('Abort Merge'), |
3479
5ff8124c73aa
Added a Mercurial entry to cancel an uncommitted merge.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3475
diff
changeset
|
430 | 0, 0, self, 'mercurial_cancel_merge') |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
431 | self.hgAbortMergeAct.setStatusTip(self.tr( |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
432 | 'Abort an uncommitted merge and lose all changes' |
3479
5ff8124c73aa
Added a Mercurial entry to cancel an uncommitted merge.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3475
diff
changeset
|
433 | )) |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
434 | self.hgAbortMergeAct.setWhatsThis(self.tr( |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
435 | """<b>Abort uncommitted merge</b>""" |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
436 | """<p>This aborts an uncommitted merge causing all changes""" |
3479
5ff8124c73aa
Added a Mercurial entry to cancel an uncommitted merge.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3475
diff
changeset
|
437 | """ to be lost.</p>""" |
5ff8124c73aa
Added a Mercurial entry to cancel an uncommitted merge.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3475
diff
changeset
|
438 | )) |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
439 | self.hgAbortMergeAct.triggered.connect(self.__hgAbortMerge) |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
440 | self.actions.append(self.hgAbortMergeAct) |
3479
5ff8124c73aa
Added a Mercurial entry to cancel an uncommitted merge.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3475
diff
changeset
|
441 | |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
442 | self.hgReMergeAct = E5Action( |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
443 | self.tr('Re-Merge'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
444 | UI.PixmapCache.getIcon("vcsMerge"), |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
445 | self.tr('Re-Merge'), |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
446 | 0, 0, self, 'mercurial_remerge') |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
447 | self.hgReMergeAct.setStatusTip(self.tr( |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
448 | 'Re-Merge all conflicting, unresolved files of the project' |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
449 | )) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
450 | self.hgReMergeAct.setWhatsThis(self.tr( |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
451 | """<b>Re-Merge</b>""" |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
452 | """<p>This re-merges all conflicting, unresolved files of the""" |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
453 | """ project discarding any previous merge attempt.</p>""" |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
454 | )) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
455 | self.hgReMergeAct.triggered.connect(self.__hgReMerge) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
456 | self.actions.append(self.hgReMergeAct) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
457 | |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
458 | self.hgShowConflictsAct = E5Action( |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
459 | self.tr('Show conflicts'), |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
460 | self.tr('Show conflicts...'), |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
461 | 0, 0, self, 'mercurial_show_conflicts') |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
462 | self.hgShowConflictsAct.setStatusTip(self.tr( |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
463 | 'Show a dialog listing all files with conflicts' |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
464 | )) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
465 | self.hgShowConflictsAct.setWhatsThis(self.tr( |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
466 | """<b>Show conflicts</b>""" |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
467 | """<p>This shows a dialog listing all files which had or still""" |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
468 | """ have conflicts.</p>""" |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
469 | )) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
470 | self.hgShowConflictsAct.triggered.connect(self.__hgShowConflicts) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
471 | self.actions.append(self.hgShowConflictsAct) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
472 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
473 | self.vcsResolveAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
474 | self.tr('Conflicts resolved'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
475 | self.tr('Con&flicts resolved'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
476 | 0, 0, self, 'mercurial_resolve') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
477 | self.vcsResolveAct.setStatusTip(self.tr( |
1880
dbd4d7698310
Added code to ensure, that some eric specific files and directories get ignored
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1879
diff
changeset
|
478 | 'Mark all conflicts of the local project as resolved' |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
479 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
480 | self.vcsResolveAct.setWhatsThis(self.tr( |
1880
dbd4d7698310
Added code to ensure, that some eric specific files and directories get ignored
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1879
diff
changeset
|
481 | """<b>Conflicts resolved</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
482 | """<p>This marks all conflicts of the local project as""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
483 | """ resolved.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
484 | )) |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
485 | self.vcsResolveAct.triggered.connect(self.__hgResolved) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
486 | self.actions.append(self.vcsResolveAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
487 | |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
488 | self.hgUnresolveAct = E5Action( |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
489 | self.tr('Conflicts unresolved'), |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
490 | self.tr('Conflicts unresolved'), |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
491 | 0, 0, self, 'mercurial_unresolve') |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
492 | self.hgUnresolveAct.setStatusTip(self.tr( |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
493 | 'Mark all conflicts of the local project as unresolved' |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
494 | )) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
495 | self.hgUnresolveAct.setWhatsThis(self.tr( |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
496 | """<b>Conflicts unresolved</b>""" |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
497 | """<p>This marks all conflicts of the local project as""" |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
498 | """ unresolved.</p>""" |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
499 | )) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
500 | self.hgUnresolveAct.triggered.connect(self.__hgUnresolved) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
501 | self.actions.append(self.hgUnresolveAct) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
502 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
503 | self.vcsTagAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
504 | self.tr('Tag in repository'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
505 | UI.PixmapCache.getIcon("vcsTag"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
506 | self.tr('&Tag in repository...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
507 | 0, 0, self, 'mercurial_tag') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
508 | self.vcsTagAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
509 | 'Tag the local project in the repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
510 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
511 | self.vcsTagAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
512 | """<b>Tag in repository</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
513 | """<p>This tags the local project in the repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
514 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
515 | self.vcsTagAct.triggered.connect(self._vcsTag) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
516 | self.actions.append(self.vcsTagAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
517 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
518 | self.hgTagListAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
519 | self.tr('List tags'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
520 | self.tr('List tags...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
521 | 0, 0, self, 'mercurial_list_tags') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
522 | self.hgTagListAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
523 | 'List tags of the project' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
524 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
525 | self.hgTagListAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
526 | """<b>List tags</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
527 | """<p>This lists the tags of the project.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
528 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
529 | self.hgTagListAct.triggered.connect(self.__hgTagList) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
530 | self.actions.append(self.hgTagListAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
531 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
532 | self.hgBranchListAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
533 | self.tr('List branches'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
534 | self.tr('List branches...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
535 | 0, 0, self, 'mercurial_list_branches') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
536 | self.hgBranchListAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
537 | 'List branches of the project' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
538 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
539 | self.hgBranchListAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
540 | """<b>List branches</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
541 | """<p>This lists the branches of the project.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
542 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
543 | self.hgBranchListAct.triggered.connect(self.__hgBranchList) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
544 | self.actions.append(self.hgBranchListAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
545 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
546 | self.hgBranchAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
547 | self.tr('Create branch'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
548 | UI.PixmapCache.getIcon("vcsBranch"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
549 | self.tr('Create &branch...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
550 | 0, 0, self, 'mercurial_branch') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
551 | self.hgBranchAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
552 | 'Create a new branch for the local project in the repository' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
553 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
554 | self.hgBranchAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
555 | """<b>Create branch</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
556 | """<p>This creates a new branch for the local project """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
557 | """in the repository.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
558 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
559 | self.hgBranchAct.triggered.connect(self.__hgBranch) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
560 | self.actions.append(self.hgBranchAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
561 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
562 | self.hgPushBranchAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
563 | self.tr('Push new branch'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
564 | UI.PixmapCache.getIcon("vcsCommit"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
565 | self.tr('Push new branch'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
566 | 0, 0, self, 'mercurial_push_branch') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
567 | self.hgPushBranchAct.setStatusTip(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
568 | 'Push the current branch of the local project as a new named' |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
569 | ' branch' |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
570 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
571 | self.hgPushBranchAct.setWhatsThis(self.tr( |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
572 | """<b>Push new branch</b>""" |
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
573 | """<p>This pushes the current branch of the local project""" |
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
574 | """ as a new named branch.</p>""" |
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
575 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
576 | self.hgPushBranchAct.triggered.connect(self.__hgPushNewBranch) |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
577 | self.actions.append(self.hgPushBranchAct) |
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
578 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
579 | self.hgCloseBranchAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
580 | self.tr('Close branch'), |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6985
diff
changeset
|
581 | UI.PixmapCache.getIcon("closehead"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
582 | self.tr('Close branch'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
583 | 0, 0, self, 'mercurial_close_branch') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
584 | self.hgCloseBranchAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
585 | 'Close the current branch of the local project' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
586 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
587 | self.hgCloseBranchAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
588 | """<b>Close branch</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
589 | """<p>This closes the current branch of the local project.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
590 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
591 | self.hgCloseBranchAct.triggered.connect(self.__hgCloseBranch) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
592 | self.actions.append(self.hgCloseBranchAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
593 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
594 | self.hgShowBranchAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
595 | self.tr('Show current branch'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
596 | self.tr('Show current branch'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
597 | 0, 0, self, 'mercurial_show_branch') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
598 | self.hgShowBranchAct.setStatusTip(self.tr( |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
599 | 'Show the current branch of the project' |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
600 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
601 | self.hgShowBranchAct.setWhatsThis(self.tr( |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
602 | """<b>Show current branch</b>""" |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
603 | """<p>This shows the current branch of the project.</p>""" |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
604 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
605 | self.hgShowBranchAct.triggered.connect(self.__hgShowBranch) |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
606 | self.actions.append(self.hgShowBranchAct) |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
607 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
608 | self.vcsSwitchAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
609 | self.tr('Switch'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
610 | UI.PixmapCache.getIcon("vcsSwitch"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
611 | self.tr('S&witch...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
612 | 0, 0, self, 'mercurial_switch') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
613 | self.vcsSwitchAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
614 | 'Switch the working directory to another revision' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
615 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
616 | self.vcsSwitchAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
617 | """<b>Switch</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
618 | """<p>This switches the working directory to another""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
619 | """ revision.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
620 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
621 | self.vcsSwitchAct.triggered.connect(self._vcsSwitch) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
622 | self.actions.append(self.vcsSwitchAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
623 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
624 | self.vcsCleanupAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
625 | self.tr('Cleanup'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
626 | self.tr('Cleanu&p'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
627 | 0, 0, self, 'mercurial_cleanup') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
628 | self.vcsCleanupAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
629 | 'Cleanup the local project' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
630 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
631 | self.vcsCleanupAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
632 | """<b>Cleanup</b>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
633 | """<p>This performs a cleanup of the local project.</p>""" |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
634 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
635 | self.vcsCleanupAct.triggered.connect(self._vcsCleanup) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
636 | self.actions.append(self.vcsCleanupAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
637 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
638 | self.vcsCommandAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
639 | self.tr('Execute command'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
640 | self.tr('E&xecute command...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
641 | 0, 0, self, 'mercurial_command') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
642 | self.vcsCommandAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
643 | 'Execute an arbitrary Mercurial command' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
644 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
645 | self.vcsCommandAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
646 | """<b>Execute command</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
647 | """<p>This opens a dialog to enter an arbitrary Mercurial""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
648 | """ command.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
649 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
650 | self.vcsCommandAct.triggered.connect(self._vcsCommand) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
651 | self.actions.append(self.vcsCommandAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
652 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
653 | self.hgConfigAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
654 | self.tr('Configure'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
655 | self.tr('Configure...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
656 | 0, 0, self, 'mercurial_configure') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
657 | self.hgConfigAct.setStatusTip(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
658 | 'Show the configuration dialog with the Mercurial page selected' |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
659 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
660 | self.hgConfigAct.setWhatsThis(self.tr( |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
661 | """<b>Configure</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
662 | """<p>Show the configuration dialog with the Mercurial page""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
663 | """ selected.</p>""" |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
664 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
665 | self.hgConfigAct.triggered.connect(self.__hgConfigure) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
666 | self.actions.append(self.hgConfigAct) |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
667 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
668 | self.hgEditUserConfigAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
669 | self.tr('Edit user configuration'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
670 | self.tr('Edit user configuration...'), |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
671 | 0, 0, self, 'mercurial_user_configure') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
672 | self.hgEditUserConfigAct.setStatusTip(self.tr( |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
673 | 'Show an editor to edit the user configuration file' |
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
674 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
675 | self.hgEditUserConfigAct.setWhatsThis(self.tr( |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
676 | """<b>Edit user configuration</b>""" |
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
677 | """<p>Show an editor to edit the user configuration file.</p>""" |
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
678 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
679 | self.hgEditUserConfigAct.triggered.connect(self.__hgEditUserConfig) |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
680 | self.actions.append(self.hgEditUserConfigAct) |
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
681 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
682 | self.hgRepoConfigAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
683 | self.tr('Edit repository configuration'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
684 | self.tr('Edit repository configuration...'), |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
685 | 0, 0, self, 'mercurial_repo_configure') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
686 | self.hgRepoConfigAct.setStatusTip(self.tr( |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
687 | 'Show an editor to edit the repository configuration file' |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
688 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
689 | self.hgRepoConfigAct.setWhatsThis(self.tr( |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
690 | """<b>Edit repository configuration</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
691 | """<p>Show an editor to edit the repository configuration""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
692 | """ file.</p>""" |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
693 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
694 | self.hgRepoConfigAct.triggered.connect(self.__hgEditRepoConfig) |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
695 | self.actions.append(self.hgRepoConfigAct) |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
696 | |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
697 | self.hgShowConfigAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
698 | self.tr('Show combined configuration settings'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
699 | self.tr('Show combined configuration settings...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
700 | 0, 0, self, 'mercurial_show_config') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
701 | self.hgShowConfigAct.setStatusTip(self.tr( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
702 | 'Show the combined configuration settings from all configuration' |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
703 | ' files' |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
704 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
705 | self.hgShowConfigAct.setWhatsThis(self.tr( |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
706 | """<b>Show combined configuration settings</b>""" |
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
707 | """<p>This shows the combined configuration settings""" |
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
708 | """ from all configuration files.</p>""" |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
709 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
710 | self.hgShowConfigAct.triggered.connect(self.__hgShowConfig) |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
711 | self.actions.append(self.hgShowConfigAct) |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
712 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
713 | self.hgShowPathsAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
714 | self.tr('Show paths'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
715 | self.tr('Show paths...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
716 | 0, 0, self, 'mercurial_show_paths') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
717 | self.hgShowPathsAct.setStatusTip(self.tr( |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
718 | 'Show the aliases for remote repositories' |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
719 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
720 | self.hgShowPathsAct.setWhatsThis(self.tr( |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
721 | """<b>Show paths</b>""" |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
722 | """<p>This shows the aliases for remote repositories.</p>""" |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
723 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
724 | self.hgShowPathsAct.triggered.connect(self.__hgShowPaths) |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
725 | self.actions.append(self.hgShowPathsAct) |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
726 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
727 | self.hgVerifyAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
728 | self.tr('Verify repository'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
729 | self.tr('Verify repository...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
730 | 0, 0, self, 'mercurial_verify') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
731 | self.hgVerifyAct.setStatusTip(self.tr( |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
732 | 'Verify the integrity of the repository' |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
733 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
734 | self.hgVerifyAct.setWhatsThis(self.tr( |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
735 | """<b>Verify repository</b>""" |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
736 | """<p>This verifies the integrity of the repository.</p>""" |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
737 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
738 | self.hgVerifyAct.triggered.connect(self.__hgVerify) |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
739 | self.actions.append(self.hgVerifyAct) |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
740 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
741 | self.hgRecoverAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
742 | self.tr('Recover'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
743 | self.tr('Recover...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
744 | 0, 0, self, 'mercurial_recover') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
745 | self.hgRecoverAct.setStatusTip(self.tr( |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
746 | 'Recover from an interrupted transaction' |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
747 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
748 | self.hgRecoverAct.setWhatsThis(self.tr( |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
749 | """<b>Recover</b>""" |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
750 | """<p>This recovers from an interrupted transaction.</p>""" |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
751 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
752 | self.hgRecoverAct.triggered.connect(self.__hgRecover) |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
753 | self.actions.append(self.hgRecoverAct) |
191
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
754 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
755 | self.hgIdentifyAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
756 | self.tr('Identify'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
757 | self.tr('Identify...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
758 | 0, 0, self, 'mercurial_identify') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
759 | self.hgIdentifyAct.setStatusTip(self.tr( |
216
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
760 | 'Identify the project directory' |
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
761 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
762 | self.hgIdentifyAct.setWhatsThis(self.tr( |
216
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
763 | """<b>Identify</b>""" |
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
764 | """<p>This identifies the project directory.</p>""" |
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
765 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
766 | self.hgIdentifyAct.triggered.connect(self.__hgIdentify) |
216
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
767 | self.actions.append(self.hgIdentifyAct) |
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
768 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
769 | self.hgCreateIgnoreAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
770 | self.tr('Create .hgignore'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
771 | self.tr('Create .hgignore'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
772 | 0, 0, self, 'mercurial_create ignore') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
773 | self.hgCreateIgnoreAct.setStatusTip(self.tr( |
191
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
774 | 'Create a .hgignore file with default values' |
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
775 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
776 | self.hgCreateIgnoreAct.setWhatsThis(self.tr( |
191
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
777 | """<b>Create .hgignore</b>""" |
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
778 | """<p>This creates a .hgignore file with default values.</p>""" |
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
779 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
780 | self.hgCreateIgnoreAct.triggered.connect(self.__hgCreateIgnore) |
191
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
781 | self.actions.append(self.hgCreateIgnoreAct) |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
782 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
783 | self.hgBundleAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
784 | self.tr('Create changegroup'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
785 | UI.PixmapCache.getIcon("vcsCreateChangegroup"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
786 | self.tr('Create changegroup...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
787 | 0, 0, self, 'mercurial_bundle') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
788 | self.hgBundleAct.setStatusTip(self.tr( |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
789 | 'Create changegroup file collecting changesets' |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
790 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
791 | self.hgBundleAct.setWhatsThis(self.tr( |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
792 | """<b>Create changegroup</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
793 | """<p>This creates a changegroup file collecting selected""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
794 | """ changesets (hg bundle).</p>""" |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
795 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
796 | self.hgBundleAct.triggered.connect(self.__hgBundle) |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
797 | self.actions.append(self.hgBundleAct) |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
798 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
799 | self.hgPreviewBundleAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
800 | self.tr('Preview changegroup'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
801 | UI.PixmapCache.getIcon("vcsPreviewChangegroup"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
802 | self.tr('Preview changegroup...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
803 | 0, 0, self, 'mercurial_preview_bundle') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
804 | self.hgPreviewBundleAct.setStatusTip(self.tr( |
218
633aa53976ae
Added code to identify a Mercurial changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
805 | 'Preview a changegroup file containing a collection of changesets' |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
202
diff
changeset
|
806 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
807 | self.hgPreviewBundleAct.setWhatsThis(self.tr( |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
202
diff
changeset
|
808 | """<b>Preview changegroup</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
809 | """<p>This previews a changegroup file containing a collection""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
810 | """ of changesets.</p>""" |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
202
diff
changeset
|
811 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
812 | self.hgPreviewBundleAct.triggered.connect(self.__hgPreviewBundle) |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
202
diff
changeset
|
813 | self.actions.append(self.hgPreviewBundleAct) |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
202
diff
changeset
|
814 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
815 | self.hgUnbundleAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
816 | self.tr('Apply changegroups'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
817 | UI.PixmapCache.getIcon("vcsApplyChangegroup"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
818 | self.tr('Apply changegroups...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
819 | 0, 0, self, 'mercurial_unbundle') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
820 | self.hgUnbundleAct.setStatusTip(self.tr( |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
821 | 'Apply one or several changegroup files' |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
822 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
823 | self.hgUnbundleAct.setWhatsThis(self.tr( |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
824 | """<b>Apply changegroups</b>""" |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
825 | """<p>This applies one or several changegroup files generated by""" |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
826 | """ the 'Create changegroup' action (hg unbundle).</p>""" |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
827 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
828 | self.hgUnbundleAct.triggered.connect(self.__hgUnbundle) |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
829 | self.actions.append(self.hgUnbundleAct) |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
830 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
831 | self.hgBisectGoodAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
832 | self.tr('Mark as "good"'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
833 | self.tr('Mark as "good"...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
834 | 0, 0, self, 'mercurial_bisect_good') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
835 | self.hgBisectGoodAct.setStatusTip(self.tr( |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
836 | 'Mark a selectable changeset as good' |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
837 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
838 | self.hgBisectGoodAct.setWhatsThis(self.tr( |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
839 | """<b>Mark as good</b>""" |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
840 | """<p>This marks a selectable changeset as good.</p>""" |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
841 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
842 | self.hgBisectGoodAct.triggered.connect(self.__hgBisectGood) |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
843 | self.actions.append(self.hgBisectGoodAct) |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
844 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
845 | self.hgBisectBadAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
846 | self.tr('Mark as "bad"'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
847 | self.tr('Mark as "bad"...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
848 | 0, 0, self, 'mercurial_bisect_bad') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
849 | self.hgBisectBadAct.setStatusTip(self.tr( |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
850 | 'Mark a selectable changeset as bad' |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
851 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
852 | self.hgBisectBadAct.setWhatsThis(self.tr( |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
853 | """<b>Mark as bad</b>""" |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
854 | """<p>This marks a selectable changeset as bad.</p>""" |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
855 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
856 | self.hgBisectBadAct.triggered.connect(self.__hgBisectBad) |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
857 | self.actions.append(self.hgBisectBadAct) |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
858 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
859 | self.hgBisectSkipAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
860 | self.tr('Skip'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
861 | self.tr('Skip...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
862 | 0, 0, self, 'mercurial_bisect_skip') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
863 | self.hgBisectSkipAct.setStatusTip(self.tr( |
1274
442c748018c5
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1267
diff
changeset
|
864 | 'Skip a selectable changeset' |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
865 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
866 | self.hgBisectSkipAct.setWhatsThis(self.tr( |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
867 | """<b>Skip</b>""" |
1274
442c748018c5
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1267
diff
changeset
|
868 | """<p>This skips a selectable changeset.</p>""" |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
869 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
870 | self.hgBisectSkipAct.triggered.connect(self.__hgBisectSkip) |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
871 | self.actions.append(self.hgBisectSkipAct) |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
872 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
873 | self.hgBisectResetAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
874 | self.tr('Reset'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
875 | self.tr('Reset'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
876 | 0, 0, self, 'mercurial_bisect_reset') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
877 | self.hgBisectResetAct.setStatusTip(self.tr( |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
878 | 'Reset the bisect search data' |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
879 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
880 | self.hgBisectResetAct.setWhatsThis(self.tr( |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
881 | """<b>Reset</b>""" |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
882 | """<p>This resets the bisect search data.</p>""" |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
883 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
884 | self.hgBisectResetAct.triggered.connect(self.__hgBisectReset) |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
885 | self.actions.append(self.hgBisectResetAct) |
219
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
886 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
887 | self.hgBackoutAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
888 | self.tr('Back out changeset'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
889 | self.tr('Back out changeset'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
890 | 0, 0, self, 'mercurial_backout') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
891 | self.hgBackoutAct.setStatusTip(self.tr( |
219
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
892 | 'Back out changes of an earlier changeset' |
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
893 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
894 | self.hgBackoutAct.setWhatsThis(self.tr( |
219
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
895 | """<b>Back out changeset</b>""" |
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
896 | """<p>This backs out changes of an earlier changeset.</p>""" |
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
897 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
898 | self.hgBackoutAct.triggered.connect(self.__hgBackout) |
219
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
899 | self.actions.append(self.hgBackoutAct) |
305
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
900 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
901 | self.hgRollbackAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
902 | self.tr('Rollback last transaction'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
903 | self.tr('Rollback last transaction'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
904 | 0, 0, self, 'mercurial_rollback') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
905 | self.hgRollbackAct.setStatusTip(self.tr( |
1005
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
906 | 'Rollback the last transaction' |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
907 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
908 | self.hgRollbackAct.setWhatsThis(self.tr( |
1005
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
909 | """<b>Rollback last transaction</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
910 | """<p>This performs a rollback of the last transaction.""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
911 | """ Transactions are used to encapsulate the effects of all""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
912 | """ commands that create new changesets or propagate existing""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
913 | """ changesets into a repository. For example, the following""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
914 | """ commands are transactional, and their effects can be""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
915 | """ rolled back:<ul>""" |
1005
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
916 | """<li>commit</li>""" |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
917 | """<li>import</li>""" |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
918 | """<li>pull</li>""" |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
919 | """<li>push (with this repository as the destination)</li>""" |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
920 | """<li>unbundle</li>""" |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
921 | """</ul>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
922 | """</p><p><strong>This command is dangerous. Please use with""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
923 | """ care. </strong></p>""" |
1005
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
924 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
925 | self.hgRollbackAct.triggered.connect(self.__hgRollback) |
1005
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
926 | self.actions.append(self.hgRollbackAct) |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
927 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
928 | self.hgServeAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
929 | self.tr('Serve project repository'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
930 | self.tr('Serve project repository...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
931 | 0, 0, self, 'mercurial_serve') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
932 | self.hgServeAct.setStatusTip(self.tr( |
305
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
933 | 'Serve the project repository' |
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
934 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
935 | self.hgServeAct.setWhatsThis(self.tr( |
305
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
936 | """<b>Serve project repository</b>""" |
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
937 | """<p>This serves the project repository.</p>""" |
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
938 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
939 | self.hgServeAct.triggered.connect(self.__hgServe) |
305
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
940 | self.actions.append(self.hgServeAct) |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
941 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
942 | self.hgImportAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
943 | self.tr('Import Patch'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
944 | UI.PixmapCache.getIcon("vcsImportPatch"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
945 | self.tr('Import Patch...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
946 | 0, 0, self, 'mercurial_import') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
947 | self.hgImportAct.setStatusTip(self.tr( |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
948 | 'Import a patch from a patch file' |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
949 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
950 | self.hgImportAct.setWhatsThis(self.tr( |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
951 | """<b>Import Patch</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
952 | """<p>This imports a patch from a patch file into the""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
953 | """ project.</p>""" |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
954 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
955 | self.hgImportAct.triggered.connect(self.__hgImport) |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
956 | self.actions.append(self.hgImportAct) |
1315
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
957 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
958 | self.hgExportAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
959 | self.tr('Export Patches'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
960 | UI.PixmapCache.getIcon("vcsExportPatch"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
961 | self.tr('Export Patches...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
962 | 0, 0, self, 'mercurial_export') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
963 | self.hgExportAct.setStatusTip(self.tr( |
1315
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
964 | 'Export revisions to patch files' |
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
965 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
966 | self.hgExportAct.setWhatsThis(self.tr( |
1315
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
967 | """<b>Export Patches</b>""" |
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
968 | """<p>This exports revisions of the project to patch files.</p>""" |
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
969 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
970 | self.hgExportAct.triggered.connect(self.__hgExport) |
1315
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
971 | self.actions.append(self.hgExportAct) |
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:
1509
diff
changeset
|
972 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
973 | self.hgPhaseAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
974 | self.tr('Change Phase'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
975 | self.tr('Change Phase...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
976 | 0, 0, self, 'mercurial_change_phase') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
977 | self.hgPhaseAct.setStatusTip(self.tr( |
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:
1509
diff
changeset
|
978 | 'Change the phase of revisions' |
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:
1509
diff
changeset
|
979 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
980 | self.hgPhaseAct.setWhatsThis(self.tr( |
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:
1509
diff
changeset
|
981 | """<b>Change Phase</b>""" |
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:
1509
diff
changeset
|
982 | """<p>This changes the phase of revisions.</p>""" |
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:
1509
diff
changeset
|
983 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
984 | self.hgPhaseAct.triggered.connect(self.__hgPhase) |
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:
1509
diff
changeset
|
985 | self.actions.append(self.hgPhaseAct) |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
986 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
987 | self.hgGraftAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
988 | self.tr('Copy Changesets'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
989 | UI.PixmapCache.getIcon("vcsGraft"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
990 | self.tr('Copy Changesets'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
991 | 0, 0, self, 'mercurial_graft') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
992 | self.hgGraftAct.setStatusTip(self.tr( |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
993 | 'Copies changesets from another branch' |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
994 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
995 | self.hgGraftAct.setWhatsThis(self.tr( |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
996 | """<b>Copy Changesets</b>""" |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
997 | """<p>This copies changesets from another branch on top of the""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
998 | """ current working directory with the user, date and""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
999 | """ description of the original changeset.</p>""" |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1000 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1001 | self.hgGraftAct.triggered.connect(self.__hgGraft) |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1002 | self.actions.append(self.hgGraftAct) |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1003 | |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1004 | self.hgGraftContinueAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1005 | self.tr('Continue Copying Session'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1006 | self.tr('Continue Copying Session'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
1007 | 0, 0, self, 'mercurial_graft_continue') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1008 | self.hgGraftContinueAct.setStatusTip(self.tr( |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1009 | 'Continue the last copying session after conflicts were resolved' |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1010 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1011 | self.hgGraftContinueAct.setWhatsThis(self.tr( |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1012 | """<b>Continue Copying Session</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1013 | """<p>This continues the last copying session after conflicts""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1014 | """ were resolved.</p>""" |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1015 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1016 | self.hgGraftContinueAct.triggered.connect(self.__hgGraftContinue) |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1017 | self.actions.append(self.hgGraftContinueAct) |
1905
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
1018 | |
6467
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1019 | self.hgGraftStopAct = E5Action( |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1020 | self.tr('Stop Copying Session'), |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1021 | self.tr('Stop Copying Session'), |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1022 | 0, 0, self, 'mercurial_graft_stop') |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1023 | self.hgGraftStopAct.setStatusTip(self.tr( |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1024 | 'Stop the interrupted copying session' |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1025 | )) |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1026 | self.hgGraftStopAct.setWhatsThis(self.tr( |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1027 | """<b>Stop Copying Session</b>""" |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1028 | """<p>This stops the interrupted copying session.</p>""" |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1029 | )) |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1030 | self.hgGraftStopAct.triggered.connect(self.__hgGraftStop) |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1031 | self.actions.append(self.hgGraftStopAct) |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1032 | |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1033 | self.hgGraftAbortAct = E5Action( |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1034 | self.tr('Abort Copying Session'), |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1035 | self.tr('Abort Copying Session'), |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1036 | 0, 0, self, 'mercurial_graft_abort') |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1037 | self.hgGraftAbortAct.setStatusTip(self.tr( |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1038 | 'Abort the interrupted copying session and rollback' |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1039 | )) |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1040 | self.hgGraftAbortAct.setWhatsThis(self.tr( |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1041 | """<b>Abort Copying Session</b>""" |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1042 | """<p>This aborts the interrupted copying session and""" |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1043 | """ rollbacks to the state before the copy.</p>""" |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1044 | )) |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1045 | self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort) |
56ef1ae1629d
Mercurial ProjectHelper: fixed an issue causing eric to not start up anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6461
diff
changeset
|
1046 | self.actions.append(self.hgGraftAbortAct) |
6461
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1047 | |
1905
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
1048 | self.hgAddSubrepoAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1049 | self.tr('Add'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1050 | UI.PixmapCache.getIcon("vcsAdd"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1051 | self.tr('Add...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
1052 | 0, 0, self, 'mercurial_add_subrepo') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1053 | self.hgAddSubrepoAct.setStatusTip(self.tr( |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1054 | 'Add a sub-repository' |
1905
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
1055 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1056 | self.hgAddSubrepoAct.setWhatsThis(self.tr( |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1057 | """<b>Add...</b>""" |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1058 | """<p>Add a sub-repository to the project.</p>""" |
1905
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
1059 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1060 | self.hgAddSubrepoAct.triggered.connect(self.__hgAddSubrepository) |
1905
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
1061 | self.actions.append(self.hgAddSubrepoAct) |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1062 | |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1063 | self.hgRemoveSubreposAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1064 | self.tr('Remove'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1065 | UI.PixmapCache.getIcon("vcsRemove"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1066 | self.tr('Remove...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
1067 | 0, 0, self, 'mercurial_remove_subrepos') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1068 | self.hgRemoveSubreposAct.setStatusTip(self.tr( |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1069 | 'Remove sub-repositories' |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1070 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1071 | self.hgRemoveSubreposAct.setWhatsThis(self.tr( |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1072 | """<b>Remove...</b>""" |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1073 | """<p>Remove sub-repositories from the project.</p>""" |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1074 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1075 | self.hgRemoveSubreposAct.triggered.connect( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1076 | self.__hgRemoveSubrepositories) |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
1077 | self.actions.append(self.hgRemoveSubreposAct) |
2820
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
1078 | |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
1079 | self.hgArchiveAct = E5Action( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1080 | self.tr('Create unversioned archive'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1081 | UI.PixmapCache.getIcon("vcsExport"), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1082 | self.tr('Create unversioned archive...'), |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
1083 | 0, 0, self, 'mercurial_archive') |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1084 | self.hgArchiveAct.setStatusTip(self.tr( |
2820
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
1085 | 'Create an unversioned archive from the repository' |
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
1086 | )) |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1087 | self.hgArchiveAct.setWhatsThis(self.tr( |
2820
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
1088 | """<b>Create unversioned archive...</b>""" |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1089 | """<p>This creates an unversioned archive from the""" |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1090 | """ repository.</p>""" |
2820
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
1091 | )) |
3345
071afe8be2a1
Changed signal/slot usage to not use constructs like 'triggered[()].connect(...)' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3315
diff
changeset
|
1092 | self.hgArchiveAct.triggered.connect(self.__hgArchive) |
2820
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
1093 | self.actions.append(self.hgArchiveAct) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1094 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1095 | self.hgBookmarksListAct = E5Action( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1096 | self.tr('List bookmarks'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1097 | UI.PixmapCache.getIcon("listBookmarks"), |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1098 | self.tr('List bookmarks...'), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1099 | 0, 0, self, 'mercurial_list_bookmarks') |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1100 | self.hgBookmarksListAct.setStatusTip(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1101 | 'List bookmarks of the project' |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1102 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1103 | self.hgBookmarksListAct.setWhatsThis(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1104 | """<b>List bookmarks</b>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1105 | """<p>This lists the bookmarks of the project.</p>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1106 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1107 | self.hgBookmarksListAct.triggered.connect(self.__hgBookmarksList) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1108 | self.actions.append(self.hgBookmarksListAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1109 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1110 | self.hgBookmarkDefineAct = E5Action( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1111 | self.tr('Define bookmark'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1112 | UI.PixmapCache.getIcon("addBookmark"), |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1113 | self.tr('Define bookmark...'), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1114 | 0, 0, self, 'mercurial_define_bookmark') |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1115 | self.hgBookmarkDefineAct.setStatusTip(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1116 | 'Define a bookmark for the project' |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1117 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1118 | self.hgBookmarkDefineAct.setWhatsThis(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1119 | """<b>Define bookmark</b>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1120 | """<p>This defines a bookmark for the project.</p>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1121 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1122 | self.hgBookmarkDefineAct.triggered.connect(self.__hgBookmarkDefine) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1123 | self.actions.append(self.hgBookmarkDefineAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1124 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1125 | self.hgBookmarkDeleteAct = E5Action( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1126 | self.tr('Delete bookmark'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1127 | UI.PixmapCache.getIcon("deleteBookmark"), |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1128 | self.tr('Delete bookmark...'), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1129 | 0, 0, self, 'mercurial_delete_bookmark') |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1130 | self.hgBookmarkDeleteAct.setStatusTip(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1131 | 'Delete a bookmark of the project' |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1132 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1133 | self.hgBookmarkDeleteAct.setWhatsThis(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1134 | """<b>Delete bookmark</b>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1135 | """<p>This deletes a bookmark of the project.</p>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1136 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1137 | self.hgBookmarkDeleteAct.triggered.connect(self.__hgBookmarkDelete) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1138 | self.actions.append(self.hgBookmarkDeleteAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1139 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1140 | self.hgBookmarkRenameAct = E5Action( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1141 | self.tr('Rename bookmark'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1142 | UI.PixmapCache.getIcon("renameBookmark"), |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1143 | self.tr('Rename bookmark...'), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1144 | 0, 0, self, 'mercurial_rename_bookmark') |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1145 | self.hgBookmarkRenameAct.setStatusTip(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1146 | 'Rename a bookmark of the project' |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1147 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1148 | self.hgBookmarkRenameAct.setWhatsThis(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1149 | """<b>Rename bookmark</b>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1150 | """<p>This renames a bookmark of the project.</p>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1151 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1152 | self.hgBookmarkRenameAct.triggered.connect(self.__hgBookmarkRename) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1153 | self.actions.append(self.hgBookmarkRenameAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1154 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1155 | self.hgBookmarkMoveAct = E5Action( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1156 | self.tr('Move bookmark'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1157 | UI.PixmapCache.getIcon("moveBookmark"), |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1158 | self.tr('Move bookmark...'), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1159 | 0, 0, self, 'mercurial_move_bookmark') |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1160 | self.hgBookmarkMoveAct.setStatusTip(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1161 | 'Move a bookmark of the project' |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1162 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1163 | self.hgBookmarkMoveAct.setWhatsThis(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1164 | """<b>Move bookmark</b>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1165 | """<p>This moves a bookmark of the project to another""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1166 | """ changeset.</p>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1167 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1168 | self.hgBookmarkMoveAct.triggered.connect(self.__hgBookmarkMove) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1169 | self.actions.append(self.hgBookmarkMoveAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1170 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1171 | self.hgBookmarkIncomingAct = E5Action( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1172 | self.tr('Show incoming bookmarks'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1173 | UI.PixmapCache.getIcon("incomingBookmark"), |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1174 | self.tr('Show incoming bookmarks'), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1175 | 0, 0, self, 'mercurial_incoming_bookmarks') |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1176 | self.hgBookmarkIncomingAct.setStatusTip(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1177 | 'Show a list of incoming bookmarks' |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1178 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1179 | self.hgBookmarkIncomingAct.setWhatsThis(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1180 | """<b>Show incoming bookmarks</b>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1181 | """<p>This shows a list of new bookmarks available at the remote""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1182 | """ repository.</p>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1183 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1184 | self.hgBookmarkIncomingAct.triggered.connect( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1185 | self.__hgBookmarkIncoming) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1186 | self.actions.append(self.hgBookmarkIncomingAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1187 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1188 | self.hgBookmarkPullAct = E5Action( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1189 | self.tr('Pull bookmark'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1190 | UI.PixmapCache.getIcon("pullBookmark"), |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1191 | self.tr('Pull bookmark'), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1192 | 0, 0, self, 'mercurial_pull_bookmark') |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1193 | self.hgBookmarkPullAct.setStatusTip(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1194 | 'Pull a bookmark from a remote repository' |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1195 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1196 | self.hgBookmarkPullAct.setWhatsThis(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1197 | """<b>Pull bookmark</b>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1198 | """<p>This pulls a bookmark from a remote repository into the """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1199 | """local repository.</p>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1200 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1201 | self.hgBookmarkPullAct.triggered.connect(self.__hgBookmarkPull) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1202 | self.actions.append(self.hgBookmarkPullAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1203 | |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1204 | self.hgBookmarkPullCurrentAct = E5Action( |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1205 | self.tr('Pull current bookmark'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1206 | UI.PixmapCache.getIcon("pullBookmark"), |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1207 | self.tr('Pull current bookmark'), |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1208 | 0, 0, self, 'mercurial_pull_current_bookmark') |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1209 | self.hgBookmarkPullCurrentAct.setStatusTip(self.tr( |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1210 | 'Pull the current bookmark from a remote repository' |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1211 | )) |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1212 | self.hgBookmarkPullCurrentAct.setWhatsThis(self.tr( |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1213 | """<b>Pull current bookmark</b>""" |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1214 | """<p>This pulls the current bookmark from a remote""" |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1215 | """ repository into the local repository.</p>""" |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1216 | )) |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1217 | self.hgBookmarkPullCurrentAct.triggered.connect( |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1218 | self.__hgBookmarkPullCurrent) |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1219 | |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1220 | self.hgBookmarkOutgoingAct = E5Action( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1221 | self.tr('Show outgoing bookmarks'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1222 | UI.PixmapCache.getIcon("outgoingBookmark"), |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1223 | self.tr('Show outgoing bookmarks'), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1224 | 0, 0, self, 'mercurial_outgoing_bookmarks') |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1225 | self.hgBookmarkOutgoingAct.setStatusTip(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1226 | 'Show a list of outgoing bookmarks' |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1227 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1228 | self.hgBookmarkOutgoingAct.setWhatsThis(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1229 | """<b>Show outgoing bookmarks</b>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1230 | """<p>This shows a list of new bookmarks available at the local""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1231 | """ repository.</p>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1232 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1233 | self.hgBookmarkOutgoingAct.triggered.connect( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1234 | self.__hgBookmarkOutgoing) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1235 | self.actions.append(self.hgBookmarkOutgoingAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1236 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1237 | self.hgBookmarkPushAct = E5Action( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1238 | self.tr('Push bookmark'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1239 | UI.PixmapCache.getIcon("pushBookmark"), |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1240 | self.tr('Push bookmark'), |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1241 | 0, 0, self, 'mercurial_push_bookmark') |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1242 | self.hgBookmarkPushAct.setStatusTip(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1243 | 'Push a bookmark to a remote repository' |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1244 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1245 | self.hgBookmarkPushAct.setWhatsThis(self.tr( |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1246 | """<b>Push bookmark</b>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1247 | """<p>This pushes a bookmark from the local repository to a """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1248 | """remote repository.</p>""" |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1249 | )) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1250 | self.hgBookmarkPushAct.triggered.connect(self.__hgBookmarkPush) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1251 | self.actions.append(self.hgBookmarkPushAct) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1252 | |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1253 | self.hgBookmarkPushCurrentAct = E5Action( |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1254 | self.tr('Push current bookmark'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1255 | UI.PixmapCache.getIcon("pushBookmark"), |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1256 | self.tr('Push current bookmark'), |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1257 | 0, 0, self, 'mercurial_push_current_bookmark') |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1258 | self.hgBookmarkPushCurrentAct.setStatusTip(self.tr( |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1259 | 'Push the current bookmark to a remote repository' |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1260 | )) |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1261 | self.hgBookmarkPushCurrentAct.setWhatsThis(self.tr( |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1262 | """<b>Push current bookmark</b>""" |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1263 | """<p>This pushes the current bookmark from the local""" |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1264 | """ repository to a remote repository.</p>""" |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1265 | )) |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1266 | self.hgBookmarkPushCurrentAct.triggered.connect( |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1267 | self.__hgBookmarkPushCurrent) |
5284
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1268 | self.actions.append(self.hgBookmarkPushCurrentAct) |
8108
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1269 | |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1270 | self.hgBookmarkPushAllAct = E5Action( |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1271 | self.tr('Push all bookmarks'), |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1272 | UI.PixmapCache.getIcon("pushBookmark"), |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1273 | self.tr('Push all bookmarks'), |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1274 | 0, 0, self, 'mercurial_push_all_bookmarks') |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1275 | self.hgBookmarkPushAllAct.setStatusTip(self.tr( |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1276 | 'Push all bookmarks to a remote repository' |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1277 | )) |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1278 | self.hgBookmarkPushAllAct.setWhatsThis(self.tr( |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1279 | """<b>Push all bookmarks</b>""" |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1280 | """<p>This pushes all bookmark from the local""" |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1281 | """ repository to a remote repository.</p>""" |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1282 | )) |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1283 | self.hgBookmarkPushAllAct.triggered.connect( |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1284 | self.__hgBookmarkPushAll) |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1285 | |
5284
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1286 | self.hgDeleteBackupsAct = E5Action( |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1287 | self.tr('Delete all backups'), |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1288 | UI.PixmapCache.getIcon("clearPrivateData"), |
5284
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1289 | self.tr('Delete all backups'), |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1290 | 0, 0, self, 'mercurial_delete_all_backups') |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1291 | self.hgDeleteBackupsAct.setStatusTip(self.tr( |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1292 | 'Delete all backup bundles stored in the backup area' |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1293 | )) |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1294 | self.hgDeleteBackupsAct.setWhatsThis(self.tr( |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1295 | """<b>Delete all backups</b>""" |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1296 | """<p>This deletes all backup bundles stored in the backup""" |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1297 | """ area of the repository.</p>""" |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1298 | )) |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1299 | self.hgDeleteBackupsAct.triggered.connect( |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1300 | self.__hgDeleteBackups) |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1301 | self.actions.append(self.hgDeleteBackupsAct) |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1302 | |
3416
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1303 | def __checkActions(self): |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1304 | """ |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1305 | Private slot to set the enabled status of actions. |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1306 | """ |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1307 | self.hgPullAct.setEnabled(self.vcs.canPull()) |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1308 | self.hgIncomingAct.setEnabled(self.vcs.canPull()) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1309 | self.hgBookmarkPullAct.setEnabled(self.vcs.canPull()) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1310 | self.hgBookmarkIncomingAct.setEnabled(self.vcs.canPull()) |
8108
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1311 | self.hgBookmarkPullCurrentAct.setEnabled(self.vcs.canPull()) |
3416
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1312 | |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1313 | self.hgPushAct.setEnabled(self.vcs.canPush()) |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1314 | self.hgPushBranchAct.setEnabled(self.vcs.canPush()) |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1315 | self.hgPushForcedAct.setEnabled(self.vcs.canPush()) |
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1316 | self.hgOutgoingAct.setEnabled(self.vcs.canPush()) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1317 | self.hgBookmarkPushAct.setEnabled(self.vcs.canPush()) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1318 | self.hgBookmarkOutgoingAct.setEnabled(self.vcs.canPush()) |
8108
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1319 | self.hgBookmarkPushCurrentAct.setEnabled(self.vcs.canPush()) |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1320 | if self.vcs.version >= (5, 7): |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1321 | self.hgBookmarkPushAllAct.setEnabled(self.vcs.canPush()) |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1322 | |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1323 | self.hgCommitMergeAct.setEnabled(self.vcs.canCommitMerge()) |
3416
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1324 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1325 | def initMenu(self, menu): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1326 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1327 | Public method to generate the VCS menu. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1328 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1329 | @param menu reference to the menu to be populated (QMenu) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1330 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1331 | menu.clear() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1332 | |
1076
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1333 | self.subMenus = [] |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1334 | |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3310
diff
changeset
|
1335 | adminMenu = QMenu(self.tr("Administration"), menu) |
1073
9f0c4b4eccb1
Made a few of the Mercurial menus tearable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1071
diff
changeset
|
1336 | adminMenu.setTearOffEnabled(True) |
195
2debcfe0e291
Changed Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
191
diff
changeset
|
1337 | adminMenu.addAction(self.hgHeadsAct) |
2debcfe0e291
Changed Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
191
diff
changeset
|
1338 | adminMenu.addAction(self.hgParentsAct) |
2debcfe0e291
Changed Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
191
diff
changeset
|
1339 | adminMenu.addAction(self.hgTipAct) |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1340 | adminMenu.addAction(self.hgShowBranchAct) |
216
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
1341 | adminMenu.addAction(self.hgIdentifyAct) |
195
2debcfe0e291
Changed Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
191
diff
changeset
|
1342 | adminMenu.addSeparator() |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1343 | adminMenu.addAction(self.hgShowPathsAct) |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1344 | adminMenu.addSeparator() |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1345 | adminMenu.addAction(self.hgShowConfigAct) |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1346 | adminMenu.addAction(self.hgRepoConfigAct) |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1347 | adminMenu.addSeparator() |
191
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
1348 | adminMenu.addAction(self.hgCreateIgnoreAct) |
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
1349 | adminMenu.addSeparator() |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1350 | adminMenu.addAction(self.hgRecoverAct) |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1351 | adminMenu.addSeparator() |
219
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
1352 | adminMenu.addAction(self.hgBackoutAct) |
1005
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
1353 | adminMenu.addAction(self.hgRollbackAct) |
219
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
1354 | adminMenu.addSeparator() |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1355 | adminMenu.addAction(self.hgVerifyAct) |
5284
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1356 | adminMenu.addSeparator() |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
1357 | adminMenu.addAction(self.hgDeleteBackupsAct) |
1076
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1358 | self.subMenus.append(adminMenu) |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1359 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1360 | specialsMenu = QMenu(self.tr("Specials"), menu) |
1073
9f0c4b4eccb1
Made a few of the Mercurial menus tearable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1071
diff
changeset
|
1361 | specialsMenu.setTearOffEnabled(True) |
2820
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
1362 | specialsMenu.addAction(self.hgArchiveAct) |
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
1363 | specialsMenu.addSeparator() |
276
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
1364 | specialsMenu.addAction(self.hgPushForcedAct) |
305
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
1365 | specialsMenu.addSeparator() |
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
1366 | specialsMenu.addAction(self.hgServeAct) |
1076
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1367 | self.subMenus.append(specialsMenu) |
276
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
1368 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1369 | bundleMenu = QMenu(self.tr("Changegroup Management"), menu) |
1073
9f0c4b4eccb1
Made a few of the Mercurial menus tearable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1071
diff
changeset
|
1370 | bundleMenu.setTearOffEnabled(True) |
216
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
1371 | bundleMenu.addAction(self.hgBundleAct) |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
202
diff
changeset
|
1372 | bundleMenu.addAction(self.hgPreviewBundleAct) |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1373 | bundleMenu.addAction(self.hgUnbundleAct) |
1076
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1374 | self.subMenus.append(bundleMenu) |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1375 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1376 | patchMenu = QMenu(self.tr("Patch Management"), menu) |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1377 | patchMenu.setTearOffEnabled(True) |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1378 | patchMenu.addAction(self.hgImportAct) |
1315
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
1379 | patchMenu.addAction(self.hgExportAct) |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1380 | self.subMenus.append(patchMenu) |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1381 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1382 | bisectMenu = QMenu(self.tr("Bisect"), menu) |
1073
9f0c4b4eccb1
Made a few of the Mercurial menus tearable.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1071
diff
changeset
|
1383 | bisectMenu.setTearOffEnabled(True) |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1384 | bisectMenu.addAction(self.hgBisectGoodAct) |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1385 | bisectMenu.addAction(self.hgBisectBadAct) |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1386 | bisectMenu.addAction(self.hgBisectSkipAct) |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1387 | bisectMenu.addAction(self.hgBisectResetAct) |
1076
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1388 | self.subMenus.append(bisectMenu) |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1389 | |
3563
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1390 | tagsMenu = QMenu(self.tr("Tags"), menu) |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1391 | tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag")) |
3563
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1392 | tagsMenu.setTearOffEnabled(True) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1393 | tagsMenu.addAction(self.vcsTagAct) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1394 | tagsMenu.addAction(self.hgTagListAct) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1395 | self.subMenus.append(tagsMenu) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1396 | |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1397 | branchesMenu = QMenu(self.tr("Branches"), menu) |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1398 | branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch")) |
3563
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1399 | branchesMenu.setTearOffEnabled(True) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1400 | branchesMenu.addAction(self.hgBranchAct) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1401 | branchesMenu.addAction(self.hgPushBranchAct) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1402 | branchesMenu.addAction(self.hgCloseBranchAct) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1403 | branchesMenu.addAction(self.hgBranchListAct) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1404 | self.subMenus.append(branchesMenu) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1405 | |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1406 | bookmarksMenu = QMenu(self.tr("Bookmarks"), menu) |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1407 | bookmarksMenu.setIcon(UI.PixmapCache.getIcon("bookmark22")) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1408 | bookmarksMenu.setTearOffEnabled(True) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1409 | bookmarksMenu.addAction(self.hgBookmarkDefineAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1410 | bookmarksMenu.addAction(self.hgBookmarkDeleteAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1411 | bookmarksMenu.addAction(self.hgBookmarkRenameAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1412 | bookmarksMenu.addAction(self.hgBookmarkMoveAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1413 | bookmarksMenu.addSeparator() |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1414 | bookmarksMenu.addAction(self.hgBookmarksListAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1415 | bookmarksMenu.addSeparator() |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1416 | bookmarksMenu.addAction(self.hgBookmarkIncomingAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1417 | bookmarksMenu.addAction(self.hgBookmarkPullAct) |
8108
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1418 | bookmarksMenu.addAction(self.hgBookmarkPullCurrentAct) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1419 | bookmarksMenu.addSeparator() |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1420 | bookmarksMenu.addAction(self.hgBookmarkOutgoingAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1421 | bookmarksMenu.addAction(self.hgBookmarkPushAct) |
8108
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1422 | bookmarksMenu.addAction(self.hgBookmarkPushCurrentAct) |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1423 | if self.vcs.version >= (5, 7): |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
1424 | bookmarksMenu.addAction(self.hgBookmarkPushAllAct) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1425 | self.subMenus.append(bookmarksMenu) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1426 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1427 | self.__extensionsMenu = QMenu(self.tr("Extensions"), menu) |
1088
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1428 | self.__extensionsMenu.setTearOffEnabled(True) |
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1429 | self.__extensionsMenu.aboutToShow.connect(self.__showExtensionMenu) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1430 | self.extensionMenus = {} |
1074
ed2585464f12
Changed the logic of the Mercurials extension menu creation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1073
diff
changeset
|
1431 | for extensionMenuTitle in sorted(self.__extensionMenuTitles): |
ed2585464f12
Changed the logic of the Mercurials extension menu creation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1073
diff
changeset
|
1432 | extensionName = self.__extensionMenuTitles[extensionMenuTitle] |
1088
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1433 | self.extensionMenus[extensionName] = self.__extensionsMenu.addMenu( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1434 | self.__extensions[extensionName].initMenu( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1435 | self.__extensionsMenu)) |
1088
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1436 | self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1437 | |
6458
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1438 | graftMenu = QMenu(self.tr("Copy Changesets"), menu) |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1439 | graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft")) |
5104
0b9420dc1093
Removed the support for the obsolete transplant Mercuril extension and made v3.0 the minimum Mercurial version.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5091
diff
changeset
|
1440 | graftMenu.setTearOffEnabled(True) |
0b9420dc1093
Removed the support for the obsolete transplant Mercuril extension and made v3.0 the minimum Mercurial version.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5091
diff
changeset
|
1441 | graftMenu.addAction(self.hgGraftAct) |
0b9420dc1093
Removed the support for the obsolete transplant Mercuril extension and made v3.0 the minimum Mercurial version.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5091
diff
changeset
|
1442 | graftMenu.addAction(self.hgGraftContinueAct) |
6461
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1443 | if self.vcs.version >= (4, 7, 0): |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1444 | graftMenu.addAction(self.hgGraftStopAct) |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1445 | graftMenu.addAction(self.hgGraftAbortAct) |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1446 | |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1447 | subrepoMenu = QMenu(self.tr("Sub-Repository"), menu) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1448 | subrepoMenu.setTearOffEnabled(True) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1449 | subrepoMenu.addAction(self.hgAddSubrepoAct) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1450 | subrepoMenu.addAction(self.hgRemoveSubreposAct) |
1905
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
1451 | |
6458
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1452 | mergeMenu = QMenu(self.tr("Merge Changesets"), menu) |
7533
88261c96484b
Removed the '.png' extension from all call to get an icon or a pixmap from the PixmapCache because this is not needed anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7493
diff
changeset
|
1453 | mergeMenu.setIcon(UI.PixmapCache.getIcon("vcsMerge")) |
6458
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1454 | mergeMenu.setTearOffEnabled(True) |
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1455 | mergeMenu.addAction(self.vcsMergeAct) |
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1456 | mergeMenu.addAction(self.hgShowConflictsAct) |
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1457 | mergeMenu.addAction(self.vcsResolveAct) |
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1458 | mergeMenu.addAction(self.hgUnresolveAct) |
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1459 | mergeMenu.addAction(self.hgReMergeAct) |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1460 | mergeMenu.addAction(self.hgCommitMergeAct) |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1461 | mergeMenu.addAction(self.hgAbortMergeAct) |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1462 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1463 | act = menu.addAction( |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1464 | UI.PixmapCache.getIcon( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1465 | os.path.join("VcsPlugins", "vcsMercurial", "icons", |
7493
1696e91a5393
Added vector icons for the mercurial and subversion plug-ins.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1466 | "mercurial.svg")), |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1467 | self.vcs.vcsName(), self._vcsInfoDisplay) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1468 | font = act.font() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1469 | font.setBold(True) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1470 | act.setFont(font) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1471 | menu.addSeparator() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1472 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1473 | menu.addAction(self.hgIncomingAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1474 | menu.addAction(self.hgPullAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1475 | menu.addAction(self.vcsUpdateAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1476 | menu.addSeparator() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1477 | menu.addAction(self.vcsCommitAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1478 | menu.addAction(self.hgOutgoingAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1479 | menu.addAction(self.hgPushAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1480 | menu.addSeparator() |
6458
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1481 | menu.addAction(self.vcsRevertAct) |
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1482 | menu.addMenu(mergeMenu) |
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1483 | menu.addMenu(graftMenu) |
97480c872ea9
Mercurial: re-arranged the project VCS menu a little bit and introduced TODO markers for new Mercurial 4.7 functionality.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1484 | menu.addAction(self.hgPhaseAct) |
4058
99ec13e695f9
Some rearrangements in the various VCS project menus.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1485 | menu.addSeparator() |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1486 | menu.addMenu(bundleMenu) |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1487 | menu.addMenu(patchMenu) |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1488 | menu.addSeparator() |
3563
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1489 | menu.addMenu(tagsMenu) |
aeb858ad35e3
Moved the Mercurial tags and branches actions into submenus in order to shorten the main menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
1490 | menu.addMenu(branchesMenu) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1491 | menu.addMenu(bookmarksMenu) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1492 | menu.addSeparator() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1493 | menu.addAction(self.hgLogBrowserAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1494 | menu.addSeparator() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1495 | menu.addAction(self.vcsStatusAct) |
2811
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
1496 | menu.addAction(self.hgSummaryAct) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1497 | menu.addSeparator() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1498 | menu.addAction(self.vcsDiffAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1499 | menu.addAction(self.hgExtDiffAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1500 | menu.addSeparator() |
4058
99ec13e695f9
Some rearrangements in the various VCS project menus.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1501 | menu.addMenu(self.__extensionsMenu) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1502 | menu.addSeparator() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1503 | menu.addAction(self.vcsSwitchAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1504 | menu.addSeparator() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1505 | menu.addMenu(subrepoMenu) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
1506 | menu.addSeparator() |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1507 | menu.addMenu(bisectMenu) |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1508 | menu.addSeparator() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1509 | menu.addAction(self.vcsCleanupAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1510 | menu.addSeparator() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1511 | menu.addAction(self.vcsCommandAct) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1512 | menu.addSeparator() |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1513 | menu.addMenu(adminMenu) |
276
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
1514 | menu.addMenu(specialsMenu) |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1515 | menu.addSeparator() |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1516 | menu.addAction(self.hgEditUserConfigAct) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1517 | menu.addAction(self.hgConfigAct) |
4058
99ec13e695f9
Some rearrangements in the various VCS project menus.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1518 | menu.addSeparator() |
99ec13e695f9
Some rearrangements in the various VCS project menus.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1519 | menu.addAction(self.vcsNewAct) |
99ec13e695f9
Some rearrangements in the various VCS project menus.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
1520 | menu.addAction(self.vcsExportAct) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1521 | |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1522 | def initToolbar(self, ui, toolbarManager): |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1523 | """ |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1524 | Public slot to initialize the VCS toolbar. |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1525 | |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1526 | @param ui reference to the main window (UserInterface) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1527 | @param toolbarManager reference to a toolbar manager object |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1528 | (E5ToolBarManager) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1529 | """ |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1530 | self.__toolbarManager = toolbarManager |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
1531 | |
4115
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1532 | self.__toolbar = QToolBar(self.tr("Mercurial"), ui) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1533 | self.__toolbar.setIconSize(UI.Config.ToolBarIconSize) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1534 | self.__toolbar.setObjectName("MercurialToolbar") |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1535 | self.__toolbar.setToolTip(self.tr('Mercurial')) |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1536 | |
4115
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1537 | self.__toolbar.addAction(self.hgLogBrowserAct) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1538 | self.__toolbar.addAction(self.vcsStatusAct) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1539 | self.__toolbar.addSeparator() |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1540 | self.__toolbar.addAction(self.vcsDiffAct) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1541 | self.__toolbar.addSeparator() |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1542 | self.__toolbar.addAction(self.vcsNewAct) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1543 | self.__toolbar.addAction(self.vcsExportAct) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1544 | self.__toolbar.addSeparator() |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1545 | |
4115
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1546 | title = self.__toolbar.windowTitle() |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1547 | toolbarManager.addToolBar(self.__toolbar, title) |
6985
6a2cab507874
Mercurial.ProjectHelper: added code to register some forgotten actions with the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
1548 | toolbarManager.addAction(self.hgIncomingAct, title) |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1549 | toolbarManager.addAction(self.hgPullAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1550 | toolbarManager.addAction(self.vcsUpdateAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1551 | toolbarManager.addAction(self.vcsCommitAct, title) |
6985
6a2cab507874
Mercurial.ProjectHelper: added code to register some forgotten actions with the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
1552 | toolbarManager.addAction(self.hgOutgoingAct, title) |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1553 | toolbarManager.addAction(self.hgPushAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1554 | toolbarManager.addAction(self.hgPushForcedAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1555 | toolbarManager.addAction(self.hgExtDiffAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1556 | toolbarManager.addAction(self.hgSummaryAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1557 | toolbarManager.addAction(self.vcsRevertAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1558 | toolbarManager.addAction(self.vcsMergeAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1559 | toolbarManager.addAction(self.hgReMergeAct, title) |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1560 | toolbarManager.addAction(self.hgCommitMergeAct, title) |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1561 | toolbarManager.addAction(self.vcsTagAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1562 | toolbarManager.addAction(self.hgBranchAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1563 | toolbarManager.addAction(self.vcsSwitchAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1564 | toolbarManager.addAction(self.hgGraftAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1565 | toolbarManager.addAction(self.hgAddSubrepoAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1566 | toolbarManager.addAction(self.hgRemoveSubreposAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1567 | toolbarManager.addAction(self.hgArchiveAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1568 | toolbarManager.addAction(self.hgBookmarksListAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1569 | toolbarManager.addAction(self.hgBookmarkDefineAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1570 | toolbarManager.addAction(self.hgBookmarkDeleteAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1571 | toolbarManager.addAction(self.hgBookmarkRenameAct, title) |
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1572 | toolbarManager.addAction(self.hgBookmarkMoveAct, title) |
6985
6a2cab507874
Mercurial.ProjectHelper: added code to register some forgotten actions with the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
1573 | toolbarManager.addAction(self.hgBookmarkIncomingAct, title) |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1574 | toolbarManager.addAction(self.hgBookmarkPullAct, title) |
6985
6a2cab507874
Mercurial.ProjectHelper: added code to register some forgotten actions with the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
1575 | toolbarManager.addAction(self.hgBookmarkPullCurrentAct, title) |
6a2cab507874
Mercurial.ProjectHelper: added code to register some forgotten actions with the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
1576 | toolbarManager.addAction(self.hgBookmarkOutgoingAct, title) |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1577 | toolbarManager.addAction(self.hgBookmarkPushAct, title) |
6985
6a2cab507874
Mercurial.ProjectHelper: added code to register some forgotten actions with the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
1578 | toolbarManager.addAction(self.hgBookmarkPushCurrentAct, title) |
5199
d3fef473554e
Added the Mercurial actions that got new eye candy to the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5193
diff
changeset
|
1579 | toolbarManager.addAction(self.hgImportAct, title) |
d3fef473554e
Added the Mercurial actions that got new eye candy to the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5193
diff
changeset
|
1580 | toolbarManager.addAction(self.hgExportAct, title) |
d3fef473554e
Added the Mercurial actions that got new eye candy to the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5193
diff
changeset
|
1581 | toolbarManager.addAction(self.hgBundleAct, title) |
d3fef473554e
Added the Mercurial actions that got new eye candy to the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5193
diff
changeset
|
1582 | toolbarManager.addAction(self.hgPreviewBundleAct, title) |
d3fef473554e
Added the Mercurial actions that got new eye candy to the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5193
diff
changeset
|
1583 | toolbarManager.addAction(self.hgUnbundleAct, title) |
6985
6a2cab507874
Mercurial.ProjectHelper: added code to register some forgotten actions with the toolbar manager.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
1584 | toolbarManager.addAction(self.hgDeleteBackupsAct, title) |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1585 | |
4115
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1586 | self.__toolbar.setEnabled(False) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1587 | self.__toolbar.setVisible(False) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1588 | |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1589 | ui.registerToolbar("mercurial", self.__toolbar.windowTitle(), |
7667
cd2e9a5ee187
VCS Interfaces: added a configuration option to disable the VCS toolbars
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7533
diff
changeset
|
1590 | self.__toolbar, "vcs") |
4115
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1591 | ui.addToolBar(self.__toolbar) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1592 | |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1593 | def removeToolbar(self, ui, toolbarManager): |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1594 | """ |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1595 | Public method to remove a toolbar created by initToolbar(). |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1596 | |
4115
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1597 | @param ui reference to the main window (UserInterface) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1598 | @param toolbarManager reference to a toolbar manager object |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1599 | (E5ToolBarManager) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1600 | """ |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1601 | ui.removeToolBar(self.__toolbar) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1602 | ui.unregisterToolbar("mercurial") |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1603 | |
4115
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1604 | title = self.__toolbar.windowTitle() |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1605 | toolbarManager.removeCategoryActions(title) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1606 | toolbarManager.removeToolBar(self.__toolbar) |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1607 | |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1608 | self.__toolbar.deleteLater() |
0c70a8f8d54a
Some more modifications to improve the plug-in toolbar handling.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4079
diff
changeset
|
1609 | self.__toolbar = None |
4079
a3319822d303
Added possibility for plug-ins to have toolbars.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4058
diff
changeset
|
1610 | |
3277
b7d9c75223e3
Made availablity of push/pull related actions dependent on configured remote repository (default/default-push in .hg/hgrc).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1611 | def showMenu(self): |
b7d9c75223e3
Made availablity of push/pull related actions dependent on configured remote repository (default/default-push in .hg/hgrc).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1612 | """ |
b7d9c75223e3
Made availablity of push/pull related actions dependent on configured remote repository (default/default-push in .hg/hgrc).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1613 | Public slot called before the vcs menu is shown. |
b7d9c75223e3
Made availablity of push/pull related actions dependent on configured remote repository (default/default-push in .hg/hgrc).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1614 | """ |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8108
diff
changeset
|
1615 | super().showMenu() |
3277
b7d9c75223e3
Made availablity of push/pull related actions dependent on configured remote repository (default/default-push in .hg/hgrc).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1616 | |
3416
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1617 | self.__checkActions() |
3277
b7d9c75223e3
Made availablity of push/pull related actions dependent on configured remote repository (default/default-push in .hg/hgrc).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
1618 | |
1076
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1619 | def shutdown(self): |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1620 | """ |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1621 | Public method to perform shutdown actions. |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1622 | """ |
1088
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1623 | self.vcs.activeExtensionsChanged.disconnect(self.__showExtensionMenu) |
3416
efce6439595a
Fixed an issue with Mercurial not realizing some changes of the configuration.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3349
diff
changeset
|
1624 | self.vcs.iniFileChanged.disconnect(self.__checkActions) |
1088
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1625 | |
1076
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1626 | # close torn off sub menus |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1627 | for menu in self.subMenus: |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1628 | if menu.isTearOffMenuVisible(): |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1629 | menu.hideTearOffMenu() |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1630 | |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1631 | # close torn off extension menus |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1632 | for extensionName in self.extensionMenus: |
3315
bd1a25ead18d
Continued implementing support for Mercurial largefiles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3310
diff
changeset
|
1633 | self.__extensions[extensionName].shutdown() |
1076
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1634 | menu = self.extensionMenus[extensionName].menu() |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1635 | if menu.isTearOffMenuVisible(): |
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1636 | menu.hideTearOffMenu() |
1088
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1637 | |
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1638 | if self.__extensionsMenu.isTearOffMenuVisible(): |
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1639 | self.__extensionsMenu.hideTearOffMenu() |
1076
6fb76985422b
Changed code to close torn off submenus of the Mercurial project menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1075
diff
changeset
|
1640 | |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1641 | def __showExtensionMenu(self): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1642 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1643 | Private slot showing the extensions menu. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1644 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1645 | for extensionName in self.extensionMenus: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1646 | self.extensionMenus[extensionName].setEnabled( |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1647 | self.vcs.isExtensionActive(extensionName)) |
7257
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1648 | if ( |
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1649 | not self.extensionMenus[extensionName].isEnabled() and |
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1650 | self.extensionMenus[extensionName].menu() |
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1651 | .isTearOffMenuVisible() |
c4d0cac9b5c9
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
1652 | ): |
1088
9c84b88cff09
Refined the Mercurial extensions code a little bit to deal with torn of menus in a better way.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1078
diff
changeset
|
1653 | self.extensionMenus[extensionName].menu().hideTearOffMenu() |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6985
diff
changeset
|
1654 | if self.vcs.version < (4, 8, 0): |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6985
diff
changeset
|
1655 | self.extensionMenus["closehead"].setEnabled(False) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1005
diff
changeset
|
1656 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1657 | def __hgExtendedDiff(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1658 | """ |
198
7ab8e126f404
Fixed a few issues with the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
1659 | Private slot used to perform a hg diff with the selection of revisions. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1660 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1661 | self.vcs.hgExtendedDiff(self.project.ppath) |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1662 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1663 | def __hgIncoming(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1664 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1665 | Private slot used to show the log of changes coming into the |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1666 | repository. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1667 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1668 | self.vcs.hgIncoming() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1669 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1670 | def __hgOutgoing(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1671 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1672 | Private slot used to show the log of changes going out of the |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2820
diff
changeset
|
1673 | repository. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1674 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1675 | self.vcs.hgOutgoing() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1676 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1677 | def __hgPull(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1678 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1679 | Private slot used to pull changes from a remote repository. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1680 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1681 | shouldReopen = self.vcs.hgPull() |
660
7a1d92437921
Added code to check, if a pull --update modified the project structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
467
diff
changeset
|
1682 | if shouldReopen: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1683 | res = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1684 | self.parent(), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1685 | self.tr("Pull"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1686 | self.tr("""The project should be reread. Do this now?"""), |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
1687 | yesDefault=True) |
660
7a1d92437921
Added code to check, if a pull --update modified the project structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
467
diff
changeset
|
1688 | if res: |
7a1d92437921
Added code to check, if a pull --update modified the project structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
467
diff
changeset
|
1689 | self.project.reopenProject() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1690 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1691 | def __hgPush(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1692 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1693 | Private slot used to push changes to a remote repository. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1694 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1695 | self.vcs.hgPush() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1696 | |
276
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
1697 | def __hgPushForced(self): |
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
1698 | """ |
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
1699 | Private slot used to push changes to a remote repository using |
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
1700 | the force option. |
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
1701 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1702 | self.vcs.hgPush(force=True) |
276
4a7e25ee406c
Added an action to perform a 'hg push -f' to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
1703 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1704 | def __hgHeads(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1705 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1706 | Private slot used to show the heads of the repository. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1707 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1708 | self.vcs.hgInfo(mode="heads") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1709 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1710 | def __hgParents(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1711 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1712 | Private slot used to show the parents of the repository. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1713 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1714 | self.vcs.hgInfo(mode="parents") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1715 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1716 | def __hgTip(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1717 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1718 | Private slot used to show the tip of the repository. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1719 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1720 | self.vcs.hgInfo(mode="tip") |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1721 | |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1722 | def __hgResolved(self): |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1723 | """ |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1724 | Private slot used to mark conflicts of the local project as being |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1725 | resolved. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1726 | """ |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1727 | self.vcs.hgResolved(self.project.ppath) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1728 | |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1729 | def __hgUnresolved(self): |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1730 | """ |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1731 | Private slot used to mark conflicts of the local project as being |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1732 | unresolved. |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1733 | """ |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1734 | self.vcs.hgResolved(self.project.ppath, unresolve=True) |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1735 | |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1736 | def __hgCommitMerge(self): |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1737 | """ |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1738 | Private slot used to commit a merge. |
3479
5ff8124c73aa
Added a Mercurial entry to cancel an uncommitted merge.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3475
diff
changeset
|
1739 | """ |
7189
4d22e3cb9827
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7183
diff
changeset
|
1740 | self.vcs.vcsCommit(self.project.ppath, self.tr('Merge'), merge=True) |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1741 | |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1742 | def __hgAbortMerge(self): |
3479
5ff8124c73aa
Added a Mercurial entry to cancel an uncommitted merge.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3475
diff
changeset
|
1743 | """ |
7152
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1744 | Private slot used to abort an uncommitted merge. |
a99df2004bb7
Commit Merge in Mercurial added and Cancel renamed to Abort Merge
Christos Sevastiadis <csevast@auth.gr>
parents:
7010
diff
changeset
|
1745 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1746 | self.vcs.hgAbortMerge() |
3479
5ff8124c73aa
Added a Mercurial entry to cancel an uncommitted merge.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3475
diff
changeset
|
1747 | |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1748 | def __hgShowConflicts(self): |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1749 | """ |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1750 | Private slot used to list all files with conflicts. |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1751 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1752 | self.vcs.hgConflicts() |
3586
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1753 | |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1754 | def __hgReMerge(self): |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1755 | """ |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1756 | Private slot used to list all files with conflicts. |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1757 | """ |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1758 | self.vcs.hgReMerge(self.project.ppath) |
6e3a6c5b58bf
Added support for various Mercurial 'resolve' subcommands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3563
diff
changeset
|
1759 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1760 | def __hgTagList(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1761 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1762 | Private slot used to list the tags of the project. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1763 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1764 | self.vcs.hgListTagBranch(True) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1765 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1766 | def __hgBranchList(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1767 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1768 | Private slot used to list the branches of the project. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1769 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1770 | self.vcs.hgListTagBranch(False) |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1771 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1772 | def __hgBranch(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1773 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1774 | Private slot used to create a new branch for the project. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1775 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1776 | self.vcs.hgBranch() |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1777 | |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1778 | def __hgShowBranch(self): |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1779 | """ |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1780 | Private slot used to show the current branch for the project. |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1781 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1782 | self.vcs.hgShowBranch() |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1783 | |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1784 | def __hgConfigure(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1785 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1786 | Private method to open the configuration dialog. |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1787 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1788 | e5App().getObject("UserInterface").showPreferences("zzz_mercurialPage") |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1789 | |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1790 | def __hgCloseBranch(self): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1791 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1792 | Private slot used to close the current branch of the local project. |
178
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1793 | """ |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1794 | if Preferences.getVCS("AutoSaveProject"): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1795 | self.project.saveProject() |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1796 | if Preferences.getVCS("AutoSaveFiles"): |
dd9f0bca5e2f
Added plugin for Mercurial version control system.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1797 | self.project.saveAllScripts() |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
1798 | self.vcs.vcsCommit(self.project.ppath, '', closeBranch=True) |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1799 | |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1800 | def __hgPushNewBranch(self): |
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1801 | """ |
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1802 | Private slot to push a new named branch. |
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1803 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1804 | self.vcs.hgPush(newBranch=True) |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1805 | |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1806 | def __hgEditUserConfig(self): |
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1807 | """ |
3914
642f8bfcd183
Corrected a typo.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3656
diff
changeset
|
1808 | Private slot used to edit the user configuration file. |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1809 | """ |
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1810 | self.vcs.hgEditUserConfig() |
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1811 | |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1812 | def __hgEditRepoConfig(self): |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1813 | """ |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1814 | Private slot used to edit the repository configuration file. |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1815 | """ |
7971
ff2971513d6d
Mercurial: completed more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7970
diff
changeset
|
1816 | self.vcs.hgEditConfig() |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1817 | |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1818 | def __hgShowConfig(self): |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1819 | """ |
1064
10bdbb173c0f
Added an entry to the Mercurial menu to edit the user configuration file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
1820 | Private slot used to show the combined configuration. |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1821 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1822 | self.vcs.hgShowConfig() |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1823 | |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1824 | def __hgVerify(self): |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1825 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1826 | Private slot used to verify the integrity of the repository. |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1827 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1828 | self.vcs.hgVerify() |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1829 | |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1830 | def __hgShowPaths(self): |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1831 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1832 | Private slot used to show the aliases for remote repositories. |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1833 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1834 | self.vcs.hgShowPaths() |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1835 | |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1836 | def __hgRecover(self): |
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1837 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1838 | Private slot used to recover from an interrupted transaction. |
189
17bb2db7a347
Added administration actions to the Mercurial plugin.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
1839 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1840 | self.vcs.hgRecover() |
191
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
1841 | |
216
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
1842 | def __hgIdentify(self): |
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
1843 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1844 | Private slot used to identify the project directory. |
216
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
1845 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1846 | self.vcs.hgIdentify() |
216
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
1847 | |
191
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
1848 | def __hgCreateIgnore(self): |
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
1849 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1850 | Private slot used to create a .hgignore file for the project. |
191
dccb19a7c52e
Added an action to create a .hgignore file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
1851 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
1852 | self.vcs.hgCreateIgnoreFile(self.project.ppath, autoAdd=True) |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1853 | |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1854 | def __hgBundle(self): |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1855 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1856 | Private slot used to create a changegroup file. |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1857 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1858 | self.vcs.hgBundle() |
216
6f9713e8d570
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
213
diff
changeset
|
1859 | |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
202
diff
changeset
|
1860 | def __hgPreviewBundle(self): |
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
202
diff
changeset
|
1861 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1862 | Private slot used to preview a changegroup file. |
213
42bb97ff0bbb
Added code to preview a changegroup file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
202
diff
changeset
|
1863 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1864 | self.vcs.hgPreviewBundle() |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1865 | |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1866 | def __hgUnbundle(self): |
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1867 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1868 | Private slot used to apply changegroup files. |
199
675623ee5d7d
Added changegroup related actions to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
1869 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1870 | shouldReopen = self.vcs.hgUnbundle() |
1283
5766284d4393
Fixed a few issues in the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1274
diff
changeset
|
1871 | if shouldReopen: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1872 | res = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1873 | self.parent(), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1874 | self.tr("Apply changegroups"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1875 | self.tr("""The project should be reread. Do this now?"""), |
1283
5766284d4393
Fixed a few issues in the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1274
diff
changeset
|
1876 | yesDefault=True) |
5766284d4393
Fixed a few issues in the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1274
diff
changeset
|
1877 | if res: |
5766284d4393
Fixed a few issues in the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1274
diff
changeset
|
1878 | self.project.reopenProject() |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1879 | |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1880 | def __hgBisectGood(self): |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1881 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1882 | Private slot used to execute the bisect --good command. |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1883 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1884 | self.vcs.hgBisect("good") |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1885 | |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1886 | def __hgBisectBad(self): |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1887 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1888 | Private slot used to execute the bisect --bad command. |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1889 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1890 | self.vcs.hgBisect("bad") |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1891 | |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1892 | def __hgBisectSkip(self): |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1893 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1894 | Private slot used to execute the bisect --skip command. |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1895 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1896 | self.vcs.hgBisect("skip") |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1897 | |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1898 | def __hgBisectReset(self): |
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1899 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1900 | Private slot used to execute the bisect --reset command. |
202
6854bb0beda5
Added bisect commands to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
1901 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1902 | self.vcs.hgBisect("reset") |
219
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
1903 | |
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
1904 | def __hgBackout(self): |
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
1905 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1906 | Private slot used to back out changes of a changeset. |
219
0553aa793753
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
218
diff
changeset
|
1907 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1908 | self.vcs.hgBackout() |
305
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
1909 | |
1005
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
1910 | def __hgRollback(self): |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
1911 | """ |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
1912 | Private slot used to rollback the last transaction. |
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
1913 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1914 | self.vcs.hgRollback() |
1005
6986db425aa2
Added support for "hg rollback" to the Mercurial interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
992
diff
changeset
|
1915 | |
305
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
1916 | def __hgServe(self): |
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
1917 | """ |
963
b672d2191a04
Added an action to push a new named branch to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
1918 | Private slot used to serve the project. |
305
5cf9e308f342
Added action to start a Mercurial server to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
276
diff
changeset
|
1919 | """ |
467
0911d8be9b07
Continued porting signal/slot usage to the new API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
454
diff
changeset
|
1920 | self.vcs.hgServe(self.project.ppath) |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1921 | |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1922 | def __hgImport(self): |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1923 | """ |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1924 | Private slot used to import a patch file. |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1925 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1926 | shouldReopen = self.vcs.hgImport() |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1927 | if shouldReopen: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1928 | res = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1929 | self.parent(), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1930 | self.tr("Import Patch"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1931 | self.tr("""The project should be reread. Do this now?"""), |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1932 | yesDefault=True) |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1933 | if res: |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1934 | self.project.reopenProject() |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1935 | |
1315
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
1936 | def __hgExport(self): |
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
1937 | """ |
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
1938 | Private slot used to export revisions to patch files. |
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
1939 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1940 | self.vcs.hgExport() |
1315
faafd2aa48d5
Added support for exporting patches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1311
diff
changeset
|
1941 | |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1942 | def __hgRevert(self): |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1943 | """ |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1944 | Private slot used to revert changes made to the local project. |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1945 | """ |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1946 | shouldReopen = self.vcs.hgRevert(self.project.ppath) |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1947 | if shouldReopen: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1948 | res = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1949 | self.parent(), |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1950 | self.tr("Revert Changes"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1951 | self.tr("""The project should be reread. Do this now?"""), |
1311
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1952 | yesDefault=True) |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1953 | if res: |
95685f9ad9f8
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1289
diff
changeset
|
1954 | self.project.reopenProject() |
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:
1509
diff
changeset
|
1955 | |
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:
1509
diff
changeset
|
1956 | def __hgPhase(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:
1509
diff
changeset
|
1957 | """ |
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:
1509
diff
changeset
|
1958 | Private slot used to change the phase of revisions. |
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:
1509
diff
changeset
|
1959 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1960 | self.vcs.hgPhase() |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1961 | |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1962 | def __hgGraft(self): |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1963 | """ |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1964 | Private slot used to copy changesets from another branch. |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1965 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1966 | shouldReopen = self.vcs.hgGraft() |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1967 | if shouldReopen: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1968 | res = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1969 | None, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1970 | self.tr("Copy Changesets"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1971 | self.tr("""The project should be reread. Do this now?"""), |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1972 | yesDefault=True) |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1973 | if res: |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1974 | self.project.reopenProject() |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1975 | |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1976 | def __hgGraftContinue(self): |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1977 | """ |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1978 | Private slot used to continue the last copying session after conflicts |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1979 | were resolved. |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1980 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1981 | shouldReopen = self.vcs.hgGraftContinue() |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1982 | if shouldReopen: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1983 | res = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
1984 | None, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1985 | self.tr("Copy Changesets (Continue)"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
1986 | self.tr("""The project should be reread. Do this now?"""), |
1655
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1987 | yesDefault=True) |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1988 | if res: |
d2b583fdde1c
Added support for the graft command as of Mercurial 2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1626
diff
changeset
|
1989 | self.project.reopenProject() |
1905
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
1990 | |
6461
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1991 | def __hgGraftStop(self): |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1992 | """ |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1993 | Private slot used to stop an interrupted copying session. |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1994 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
1995 | shouldReopen = self.vcs.hgGraftStop() |
6461
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1996 | if shouldReopen: |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1997 | res = E5MessageBox.yesNo( |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1998 | None, |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
1999 | self.tr("Copy Changesets (Stop)"), |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2000 | self.tr("""The project should be reread. Do this now?"""), |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2001 | yesDefault=True) |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2002 | if res: |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2003 | self.project.reopenProject() |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2004 | |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2005 | def __hgGraftAbort(self): |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2006 | """ |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2007 | Private slot used to abort an interrupted copying session and perform |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2008 | a rollback. |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2009 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2010 | shouldReopen = self.vcs.hgGraftAbort() |
6461
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2011 | if shouldReopen: |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2012 | res = E5MessageBox.yesNo( |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2013 | None, |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2014 | self.tr("Copy Changesets (Abort)"), |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2015 | self.tr("""The project should be reread. Do this now?"""), |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2016 | yesDefault=True) |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2017 | if res: |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2018 | self.project.reopenProject() |
48bf6c3f084f
hg, ProjectHelper: added support for graft --stop and graft --abort as of Mercurial 4.7.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6458
diff
changeset
|
2019 | |
1905
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
2020 | def __hgAddSubrepository(self): |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
2021 | """ |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
2022 | Private slot used to add a sub-repository. |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
2023 | """ |
7ad9161c5293
Started adding support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1892
diff
changeset
|
2024 | self.vcs.hgAddSubrepository() |
1906
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
2025 | |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
2026 | def __hgRemoveSubrepositories(self): |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
2027 | """ |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
2028 | Private slot used to remove sub-repositories. |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
2029 | """ |
8487f9c2533b
Continued implementing support for Mercurial sub-repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1905
diff
changeset
|
2030 | self.vcs.hgRemoveSubrepositories() |
2811
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
2031 | |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
2032 | def __hgSummary(self): |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
2033 | """ |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
2034 | Private slot to show a working directory summary. |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
2035 | """ |
7b2ec3af3505
Added support for the Mercurial 'summary' command.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
2036 | self.vcs.hgSummary() |
2820
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
2037 | |
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
2038 | def __hgArchive(self): |
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
2039 | """ |
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
2040 | Private slot to create an unversioned archive from the repository. |
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
2041 | """ |
642c1f3c23c8
Started implementing support for the Mercurial archive function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2817
diff
changeset
|
2042 | self.vcs.hgArchive() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2043 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2044 | def __hgBookmarksList(self): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2045 | """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2046 | Private slot used to list the bookmarks. |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2047 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2048 | self.vcs.hgListBookmarks() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2049 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2050 | def __hgBookmarkDefine(self): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2051 | """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2052 | Private slot used to define a bookmark. |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2053 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2054 | self.vcs.hgBookmarkDefine() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2055 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2056 | def __hgBookmarkDelete(self): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2057 | """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2058 | Private slot used to delete a bookmark. |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2059 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2060 | self.vcs.hgBookmarkDelete() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2061 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2062 | def __hgBookmarkRename(self): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2063 | """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2064 | Private slot used to rename a bookmark. |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2065 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2066 | self.vcs.hgBookmarkRename() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2067 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2068 | def __hgBookmarkMove(self): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2069 | """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2070 | Private slot used to move a bookmark. |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2071 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2072 | self.vcs.hgBookmarkMove() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2073 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2074 | def __hgBookmarkIncoming(self): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2075 | """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2076 | Private slot used to show a list of incoming bookmarks. |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2077 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2078 | self.vcs.hgBookmarkIncoming() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2079 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2080 | def __hgBookmarkOutgoing(self): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2081 | """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2082 | Private slot used to show a list of outgoing bookmarks. |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2083 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2084 | self.vcs.hgBookmarkOutgoing() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2085 | |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2086 | def __hgBookmarkPull(self): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2087 | """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2088 | Private slot used to pull a bookmark from a remote repository. |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2089 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2090 | self.vcs.hgBookmarkPull() |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2091 | |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2092 | def __hgBookmarkPullCurrent(self): |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2093 | """ |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2094 | Private slot used to pull the current bookmark from a remote |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2095 | repository. |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2096 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2097 | self.vcs.hgBookmarkPull(current=True) |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2098 | |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2099 | def __hgBookmarkPush(self): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2100 | """ |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2101 | Private slot used to push a bookmark to a remote repository. |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3515
diff
changeset
|
2102 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2103 | self.vcs.hgBookmarkPush() |
5091
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2104 | |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2105 | def __hgBookmarkPushCurrent(self): |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2106 | """ |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2107 | Private slot used to push the current bookmark to a remote repository. |
dfac14826e78
Added support for pulling and pushing the current bookmark to the Mercurial plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2108 | """ |
7970
c4ee8a81584c
Mercurial: started more code cleanup.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
2109 | self.vcs.hgBookmarkPush(current=True) |
5284
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
2110 | |
8108
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
2111 | def __hgBookmarkPushAll(self): |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
2112 | """ |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
2113 | Private slot to push all bookmarks to a remote repository. |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
2114 | """ |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
2115 | self.vcs.hgBookmarkPush(allBookmarks=True) |
a42ae6be4cc3
Mercurial: added support for Mercurial 5.7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7971
diff
changeset
|
2116 | |
5284
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
2117 | def __hgDeleteBackups(self): |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
2118 | """ |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
2119 | Private slot used to delete all backup bundles. |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
2120 | """ |
3a2f9bee8974
Added an action to the Mercurial administration menu to clean out the backup bundles.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5283
diff
changeset
|
2121 | self.vcs.hgDeleteBackups() |