9 |
9 |
10 import os |
10 import os |
11 |
11 |
12 from PyQt6.QtWidgets import QMenu, QToolBar |
12 from PyQt6.QtWidgets import QMenu, QToolBar |
13 |
13 |
14 from EricWidgets import EricMessageBox |
14 from eric7.EricWidgets import EricMessageBox |
15 from EricWidgets.EricApplication import ericApp |
15 from eric7.EricWidgets.EricApplication import ericApp |
16 |
16 |
17 from VCS.ProjectHelper import VcsProjectHelper |
17 from eric7.VCS.ProjectHelper import VcsProjectHelper |
18 |
18 |
19 from EricGui.EricAction import EricAction |
19 from eric7.EricGui.EricAction import EricAction |
20 |
20 |
21 import UI.PixmapCache |
21 from eric7.EricGui import EricPixmapCache |
22 import Preferences |
22 from eric7.UI import Config |
|
23 from eric7 import Preferences |
23 |
24 |
24 |
25 |
25 class HgProjectHelper(VcsProjectHelper): |
26 class HgProjectHelper(VcsProjectHelper): |
26 """ |
27 """ |
27 Class implementing the VCS project helper for Mercurial. |
28 Class implementing the VCS project helper for Mercurial. |
117 """ |
118 """ |
118 Public method to generate the action objects. |
119 Public method to generate the action objects. |
119 """ |
120 """ |
120 self.vcsNewAct = EricAction( |
121 self.vcsNewAct = EricAction( |
121 self.tr("New from repository"), |
122 self.tr("New from repository"), |
122 UI.PixmapCache.getIcon("vcsCheckout"), |
123 EricPixmapCache.getIcon("vcsCheckout"), |
123 self.tr("&New from repository..."), |
124 self.tr("&New from repository..."), |
124 0, |
125 0, |
125 0, |
126 0, |
126 self, |
127 self, |
127 "mercurial_new", |
128 "mercurial_new", |
139 self.vcsNewAct.triggered.connect(self._vcsCheckout) |
140 self.vcsNewAct.triggered.connect(self._vcsCheckout) |
140 self.actions.append(self.vcsNewAct) |
141 self.actions.append(self.vcsNewAct) |
141 |
142 |
142 self.hgIncomingAct = EricAction( |
143 self.hgIncomingAct = EricAction( |
143 self.tr("Show incoming log"), |
144 self.tr("Show incoming log"), |
144 UI.PixmapCache.getIcon("vcsUpdate"), |
145 EricPixmapCache.getIcon("vcsUpdate"), |
145 self.tr("Show incoming log"), |
146 self.tr("Show incoming log"), |
146 0, |
147 0, |
147 0, |
148 0, |
148 self, |
149 self, |
149 "mercurial_incoming", |
150 "mercurial_incoming", |
159 self.hgIncomingAct.triggered.connect(self.__hgIncoming) |
160 self.hgIncomingAct.triggered.connect(self.__hgIncoming) |
160 self.actions.append(self.hgIncomingAct) |
161 self.actions.append(self.hgIncomingAct) |
161 |
162 |
162 self.hgPullAct = EricAction( |
163 self.hgPullAct = EricAction( |
163 self.tr("Pull changes"), |
164 self.tr("Pull changes"), |
164 UI.PixmapCache.getIcon("vcsUpdate"), |
165 EricPixmapCache.getIcon("vcsUpdate"), |
165 self.tr("Pull changes"), |
166 self.tr("Pull changes"), |
166 0, |
167 0, |
167 0, |
168 0, |
168 self, |
169 self, |
169 "mercurial_pull", |
170 "mercurial_pull", |
179 self.hgPullAct.triggered.connect(self.__hgPull) |
180 self.hgPullAct.triggered.connect(self.__hgPull) |
180 self.actions.append(self.hgPullAct) |
181 self.actions.append(self.hgPullAct) |
181 |
182 |
182 self.vcsUpdateAct = EricAction( |
183 self.vcsUpdateAct = EricAction( |
183 self.tr("Update from repository"), |
184 self.tr("Update from repository"), |
184 UI.PixmapCache.getIcon("vcsUpdate"), |
185 EricPixmapCache.getIcon("vcsUpdate"), |
185 self.tr("&Update from repository"), |
186 self.tr("&Update from repository"), |
186 0, |
187 0, |
187 0, |
188 0, |
188 self, |
189 self, |
189 "mercurial_update", |
190 "mercurial_update", |
201 self.vcsUpdateAct.triggered.connect(self._vcsUpdate) |
202 self.vcsUpdateAct.triggered.connect(self._vcsUpdate) |
202 self.actions.append(self.vcsUpdateAct) |
203 self.actions.append(self.vcsUpdateAct) |
203 |
204 |
204 self.vcsCommitAct = EricAction( |
205 self.vcsCommitAct = EricAction( |
205 self.tr("Commit changes to repository"), |
206 self.tr("Commit changes to repository"), |
206 UI.PixmapCache.getIcon("vcsCommit"), |
207 EricPixmapCache.getIcon("vcsCommit"), |
207 self.tr("&Commit changes to repository..."), |
208 self.tr("&Commit changes to repository..."), |
208 0, |
209 0, |
209 0, |
210 0, |
210 self, |
211 self, |
211 "mercurial_commit", |
212 "mercurial_commit", |
223 self.vcsCommitAct.triggered.connect(self._vcsCommit) |
224 self.vcsCommitAct.triggered.connect(self._vcsCommit) |
224 self.actions.append(self.vcsCommitAct) |
225 self.actions.append(self.vcsCommitAct) |
225 |
226 |
226 self.hgOutgoingAct = EricAction( |
227 self.hgOutgoingAct = EricAction( |
227 self.tr("Show outgoing log"), |
228 self.tr("Show outgoing log"), |
228 UI.PixmapCache.getIcon("vcsCommit"), |
229 EricPixmapCache.getIcon("vcsCommit"), |
229 self.tr("Show outgoing log"), |
230 self.tr("Show outgoing log"), |
230 0, |
231 0, |
231 0, |
232 0, |
232 self, |
233 self, |
233 "mercurial_outgoing", |
234 "mercurial_outgoing", |
243 self.hgOutgoingAct.triggered.connect(self.__hgOutgoing) |
244 self.hgOutgoingAct.triggered.connect(self.__hgOutgoing) |
244 self.actions.append(self.hgOutgoingAct) |
245 self.actions.append(self.hgOutgoingAct) |
245 |
246 |
246 self.hgPushAct = EricAction( |
247 self.hgPushAct = EricAction( |
247 self.tr("Push changes"), |
248 self.tr("Push changes"), |
248 UI.PixmapCache.getIcon("vcsCommit"), |
249 EricPixmapCache.getIcon("vcsCommit"), |
249 self.tr("Push changes"), |
250 self.tr("Push changes"), |
250 0, |
251 0, |
251 0, |
252 0, |
252 self, |
253 self, |
253 "mercurial_push", |
254 "mercurial_push", |
263 self.hgPushAct.triggered.connect(self.__hgPush) |
264 self.hgPushAct.triggered.connect(self.__hgPush) |
264 self.actions.append(self.hgPushAct) |
265 self.actions.append(self.hgPushAct) |
265 |
266 |
266 self.hgPushForcedAct = EricAction( |
267 self.hgPushForcedAct = EricAction( |
267 self.tr("Push changes (force)"), |
268 self.tr("Push changes (force)"), |
268 UI.PixmapCache.getIcon("vcsCommit"), |
269 EricPixmapCache.getIcon("vcsCommit"), |
269 self.tr("Push changes (force)"), |
270 self.tr("Push changes (force)"), |
270 0, |
271 0, |
271 0, |
272 0, |
272 self, |
273 self, |
273 "mercurial_push_forced", |
274 "mercurial_push_forced", |
285 self.hgPushForcedAct.triggered.connect(self.__hgPushForced) |
286 self.hgPushForcedAct.triggered.connect(self.__hgPushForced) |
286 self.actions.append(self.hgPushForcedAct) |
287 self.actions.append(self.hgPushForcedAct) |
287 |
288 |
288 self.vcsExportAct = EricAction( |
289 self.vcsExportAct = EricAction( |
289 self.tr("Export from repository"), |
290 self.tr("Export from repository"), |
290 UI.PixmapCache.getIcon("vcsExport"), |
291 EricPixmapCache.getIcon("vcsExport"), |
291 self.tr("&Export from repository..."), |
292 self.tr("&Export from repository..."), |
292 0, |
293 0, |
293 0, |
294 0, |
294 self, |
295 self, |
295 "mercurial_export_repo", |
296 "mercurial_export_repo", |
304 self.vcsExportAct.triggered.connect(self._vcsExport) |
305 self.vcsExportAct.triggered.connect(self._vcsExport) |
305 self.actions.append(self.vcsExportAct) |
306 self.actions.append(self.vcsExportAct) |
306 |
307 |
307 self.hgLogBrowserAct = EricAction( |
308 self.hgLogBrowserAct = EricAction( |
308 self.tr("Show log browser"), |
309 self.tr("Show log browser"), |
309 UI.PixmapCache.getIcon("vcsLog"), |
310 EricPixmapCache.getIcon("vcsLog"), |
310 self.tr("Show log browser"), |
311 self.tr("Show log browser"), |
311 0, |
312 0, |
312 0, |
313 0, |
313 self, |
314 self, |
314 "mercurial_log_browser", |
315 "mercurial_log_browser", |
327 self.hgLogBrowserAct.triggered.connect(self._vcsLogBrowser) |
328 self.hgLogBrowserAct.triggered.connect(self._vcsLogBrowser) |
328 self.actions.append(self.hgLogBrowserAct) |
329 self.actions.append(self.hgLogBrowserAct) |
329 |
330 |
330 self.vcsDiffAct = EricAction( |
331 self.vcsDiffAct = EricAction( |
331 self.tr("Show differences"), |
332 self.tr("Show differences"), |
332 UI.PixmapCache.getIcon("vcsDiff"), |
333 EricPixmapCache.getIcon("vcsDiff"), |
333 self.tr("Show &difference"), |
334 self.tr("Show &difference"), |
334 0, |
335 0, |
335 0, |
336 0, |
336 self, |
337 self, |
337 "mercurial_diff", |
338 "mercurial_diff", |
349 self.vcsDiffAct.triggered.connect(self._vcsDiff) |
350 self.vcsDiffAct.triggered.connect(self._vcsDiff) |
350 self.actions.append(self.vcsDiffAct) |
351 self.actions.append(self.vcsDiffAct) |
351 |
352 |
352 self.hgExtDiffAct = EricAction( |
353 self.hgExtDiffAct = EricAction( |
353 self.tr("Show differences (extended)"), |
354 self.tr("Show differences (extended)"), |
354 UI.PixmapCache.getIcon("vcsDiff"), |
355 EricPixmapCache.getIcon("vcsDiff"), |
355 self.tr("Show differences (extended)"), |
356 self.tr("Show differences (extended)"), |
356 0, |
357 0, |
357 0, |
358 0, |
358 self, |
359 self, |
359 "mercurial_extendeddiff", |
360 "mercurial_extendeddiff", |
371 self.hgExtDiffAct.triggered.connect(self.__hgExtendedDiff) |
372 self.hgExtDiffAct.triggered.connect(self.__hgExtendedDiff) |
372 self.actions.append(self.hgExtDiffAct) |
373 self.actions.append(self.hgExtDiffAct) |
373 |
374 |
374 self.vcsStatusAct = EricAction( |
375 self.vcsStatusAct = EricAction( |
375 self.tr("Show status"), |
376 self.tr("Show status"), |
376 UI.PixmapCache.getIcon("vcsStatus"), |
377 EricPixmapCache.getIcon("vcsStatus"), |
377 self.tr("Show &status..."), |
378 self.tr("Show &status..."), |
378 0, |
379 0, |
379 0, |
380 0, |
380 self, |
381 self, |
381 "mercurial_status", |
382 "mercurial_status", |
390 self.vcsStatusAct.triggered.connect(self._vcsStatus) |
391 self.vcsStatusAct.triggered.connect(self._vcsStatus) |
391 self.actions.append(self.vcsStatusAct) |
392 self.actions.append(self.vcsStatusAct) |
392 |
393 |
393 self.hgSummaryAct = EricAction( |
394 self.hgSummaryAct = EricAction( |
394 self.tr("Show Summary"), |
395 self.tr("Show Summary"), |
395 UI.PixmapCache.getIcon("vcsSummary"), |
396 EricPixmapCache.getIcon("vcsSummary"), |
396 self.tr("Show summary..."), |
397 self.tr("Show summary..."), |
397 0, |
398 0, |
398 0, |
399 0, |
399 self, |
400 self, |
400 "mercurial_summary", |
401 "mercurial_summary", |
455 self.hgTipAct.triggered.connect(self.__hgTip) |
456 self.hgTipAct.triggered.connect(self.__hgTip) |
456 self.actions.append(self.hgTipAct) |
457 self.actions.append(self.hgTipAct) |
457 |
458 |
458 self.vcsRevertAct = EricAction( |
459 self.vcsRevertAct = EricAction( |
459 self.tr("Revert changes"), |
460 self.tr("Revert changes"), |
460 UI.PixmapCache.getIcon("vcsRevert"), |
461 EricPixmapCache.getIcon("vcsRevert"), |
461 self.tr("Re&vert changes"), |
462 self.tr("Re&vert changes"), |
462 0, |
463 0, |
463 0, |
464 0, |
464 self, |
465 self, |
465 "mercurial_revert", |
466 "mercurial_revert", |
476 self.vcsRevertAct.triggered.connect(self.__hgRevert) |
477 self.vcsRevertAct.triggered.connect(self.__hgRevert) |
477 self.actions.append(self.vcsRevertAct) |
478 self.actions.append(self.vcsRevertAct) |
478 |
479 |
479 self.vcsMergeAct = EricAction( |
480 self.vcsMergeAct = EricAction( |
480 self.tr("Merge"), |
481 self.tr("Merge"), |
481 UI.PixmapCache.getIcon("vcsMerge"), |
482 EricPixmapCache.getIcon("vcsMerge"), |
482 self.tr("Mer&ge changes..."), |
483 self.tr("Mer&ge changes..."), |
483 0, |
484 0, |
484 0, |
485 0, |
485 self, |
486 self, |
486 "mercurial_merge", |
487 "mercurial_merge", |
622 self.hgUnresolveAct.triggered.connect(self.__hgUnresolved) |
623 self.hgUnresolveAct.triggered.connect(self.__hgUnresolved) |
623 self.actions.append(self.hgUnresolveAct) |
624 self.actions.append(self.hgUnresolveAct) |
624 |
625 |
625 self.vcsTagAct = EricAction( |
626 self.vcsTagAct = EricAction( |
626 self.tr("Tag in repository"), |
627 self.tr("Tag in repository"), |
627 UI.PixmapCache.getIcon("vcsTag"), |
628 EricPixmapCache.getIcon("vcsTag"), |
628 self.tr("&Tag in repository..."), |
629 self.tr("&Tag in repository..."), |
629 0, |
630 0, |
630 0, |
631 0, |
631 self, |
632 self, |
632 "mercurial_tag", |
633 "mercurial_tag", |
676 self.hgBranchListAct.triggered.connect(self.__hgBranchList) |
677 self.hgBranchListAct.triggered.connect(self.__hgBranchList) |
677 self.actions.append(self.hgBranchListAct) |
678 self.actions.append(self.hgBranchListAct) |
678 |
679 |
679 self.hgBranchAct = EricAction( |
680 self.hgBranchAct = EricAction( |
680 self.tr("Create branch"), |
681 self.tr("Create branch"), |
681 UI.PixmapCache.getIcon("vcsBranch"), |
682 EricPixmapCache.getIcon("vcsBranch"), |
682 self.tr("Create &branch..."), |
683 self.tr("Create &branch..."), |
683 0, |
684 0, |
684 0, |
685 0, |
685 self, |
686 self, |
686 "mercurial_branch", |
687 "mercurial_branch", |
698 self.hgBranchAct.triggered.connect(self.__hgBranch) |
699 self.hgBranchAct.triggered.connect(self.__hgBranch) |
699 self.actions.append(self.hgBranchAct) |
700 self.actions.append(self.hgBranchAct) |
700 |
701 |
701 self.hgPushBranchAct = EricAction( |
702 self.hgPushBranchAct = EricAction( |
702 self.tr("Push new branch"), |
703 self.tr("Push new branch"), |
703 UI.PixmapCache.getIcon("vcsCommit"), |
704 EricPixmapCache.getIcon("vcsCommit"), |
704 self.tr("Push new branch"), |
705 self.tr("Push new branch"), |
705 0, |
706 0, |
706 0, |
707 0, |
707 self, |
708 self, |
708 "mercurial_push_branch", |
709 "mercurial_push_branch", |
722 self.hgPushBranchAct.triggered.connect(self.__hgPushNewBranch) |
723 self.hgPushBranchAct.triggered.connect(self.__hgPushNewBranch) |
723 self.actions.append(self.hgPushBranchAct) |
724 self.actions.append(self.hgPushBranchAct) |
724 |
725 |
725 self.hgCloseBranchAct = EricAction( |
726 self.hgCloseBranchAct = EricAction( |
726 self.tr("Close branch"), |
727 self.tr("Close branch"), |
727 UI.PixmapCache.getIcon("closehead"), |
728 EricPixmapCache.getIcon("closehead"), |
728 self.tr("Close branch"), |
729 self.tr("Close branch"), |
729 0, |
730 0, |
730 0, |
731 0, |
731 self, |
732 self, |
732 "mercurial_close_branch", |
733 "mercurial_close_branch", |
763 self.hgShowBranchAct.triggered.connect(self.__hgShowBranch) |
764 self.hgShowBranchAct.triggered.connect(self.__hgShowBranch) |
764 self.actions.append(self.hgShowBranchAct) |
765 self.actions.append(self.hgShowBranchAct) |
765 |
766 |
766 self.vcsSwitchAct = EricAction( |
767 self.vcsSwitchAct = EricAction( |
767 self.tr("Switch"), |
768 self.tr("Switch"), |
768 UI.PixmapCache.getIcon("vcsSwitch"), |
769 EricPixmapCache.getIcon("vcsSwitch"), |
769 self.tr("S&witch..."), |
770 self.tr("S&witch..."), |
770 0, |
771 0, |
771 0, |
772 0, |
772 self, |
773 self, |
773 "mercurial_switch", |
774 "mercurial_switch", |
996 self.hgCreateIgnoreAct.triggered.connect(self.__hgCreateIgnore) |
997 self.hgCreateIgnoreAct.triggered.connect(self.__hgCreateIgnore) |
997 self.actions.append(self.hgCreateIgnoreAct) |
998 self.actions.append(self.hgCreateIgnoreAct) |
998 |
999 |
999 self.hgBundleAct = EricAction( |
1000 self.hgBundleAct = EricAction( |
1000 self.tr("Create changegroup"), |
1001 self.tr("Create changegroup"), |
1001 UI.PixmapCache.getIcon("vcsCreateChangegroup"), |
1002 EricPixmapCache.getIcon("vcsCreateChangegroup"), |
1002 self.tr("Create changegroup..."), |
1003 self.tr("Create changegroup..."), |
1003 0, |
1004 0, |
1004 0, |
1005 0, |
1005 self, |
1006 self, |
1006 "mercurial_bundle", |
1007 "mercurial_bundle", |
1018 self.hgBundleAct.triggered.connect(self.__hgBundle) |
1019 self.hgBundleAct.triggered.connect(self.__hgBundle) |
1019 self.actions.append(self.hgBundleAct) |
1020 self.actions.append(self.hgBundleAct) |
1020 |
1021 |
1021 self.hgPreviewBundleAct = EricAction( |
1022 self.hgPreviewBundleAct = EricAction( |
1022 self.tr("Preview changegroup"), |
1023 self.tr("Preview changegroup"), |
1023 UI.PixmapCache.getIcon("vcsPreviewChangegroup"), |
1024 EricPixmapCache.getIcon("vcsPreviewChangegroup"), |
1024 self.tr("Preview changegroup..."), |
1025 self.tr("Preview changegroup..."), |
1025 0, |
1026 0, |
1026 0, |
1027 0, |
1027 self, |
1028 self, |
1028 "mercurial_preview_bundle", |
1029 "mercurial_preview_bundle", |
1040 self.hgPreviewBundleAct.triggered.connect(self.__hgPreviewBundle) |
1041 self.hgPreviewBundleAct.triggered.connect(self.__hgPreviewBundle) |
1041 self.actions.append(self.hgPreviewBundleAct) |
1042 self.actions.append(self.hgPreviewBundleAct) |
1042 |
1043 |
1043 self.hgUnbundleAct = EricAction( |
1044 self.hgUnbundleAct = EricAction( |
1044 self.tr("Apply changegroups"), |
1045 self.tr("Apply changegroups"), |
1045 UI.PixmapCache.getIcon("vcsApplyChangegroup"), |
1046 EricPixmapCache.getIcon("vcsApplyChangegroup"), |
1046 self.tr("Apply changegroups..."), |
1047 self.tr("Apply changegroups..."), |
1047 0, |
1048 0, |
1048 0, |
1049 0, |
1049 self, |
1050 self, |
1050 "mercurial_unbundle", |
1051 "mercurial_unbundle", |
1189 self.hgServeAct.triggered.connect(self.__hgServe) |
1190 self.hgServeAct.triggered.connect(self.__hgServe) |
1190 self.actions.append(self.hgServeAct) |
1191 self.actions.append(self.hgServeAct) |
1191 |
1192 |
1192 self.hgImportAct = EricAction( |
1193 self.hgImportAct = EricAction( |
1193 self.tr("Import Patch"), |
1194 self.tr("Import Patch"), |
1194 UI.PixmapCache.getIcon("vcsImportPatch"), |
1195 EricPixmapCache.getIcon("vcsImportPatch"), |
1195 self.tr("Import Patch..."), |
1196 self.tr("Import Patch..."), |
1196 0, |
1197 0, |
1197 0, |
1198 0, |
1198 self, |
1199 self, |
1199 "mercurial_import", |
1200 "mercurial_import", |
1209 self.hgImportAct.triggered.connect(self.__hgImport) |
1210 self.hgImportAct.triggered.connect(self.__hgImport) |
1210 self.actions.append(self.hgImportAct) |
1211 self.actions.append(self.hgImportAct) |
1211 |
1212 |
1212 self.hgExportAct = EricAction( |
1213 self.hgExportAct = EricAction( |
1213 self.tr("Export Patches"), |
1214 self.tr("Export Patches"), |
1214 UI.PixmapCache.getIcon("vcsExportPatch"), |
1215 EricPixmapCache.getIcon("vcsExportPatch"), |
1215 self.tr("Export Patches..."), |
1216 self.tr("Export Patches..."), |
1216 0, |
1217 0, |
1217 0, |
1218 0, |
1218 self, |
1219 self, |
1219 "mercurial_export", |
1220 "mercurial_export", |
1246 self.hgPhaseAct.triggered.connect(self.__hgPhase) |
1247 self.hgPhaseAct.triggered.connect(self.__hgPhase) |
1247 self.actions.append(self.hgPhaseAct) |
1248 self.actions.append(self.hgPhaseAct) |
1248 |
1249 |
1249 self.hgGraftAct = EricAction( |
1250 self.hgGraftAct = EricAction( |
1250 self.tr("Copy Changesets"), |
1251 self.tr("Copy Changesets"), |
1251 UI.PixmapCache.getIcon("vcsGraft"), |
1252 EricPixmapCache.getIcon("vcsGraft"), |
1252 self.tr("Copy Changesets"), |
1253 self.tr("Copy Changesets"), |
1253 0, |
1254 0, |
1254 0, |
1255 0, |
1255 self, |
1256 self, |
1256 "mercurial_graft", |
1257 "mercurial_graft", |
1329 self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort) |
1330 self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort) |
1330 self.actions.append(self.hgGraftAbortAct) |
1331 self.actions.append(self.hgGraftAbortAct) |
1331 |
1332 |
1332 self.hgAddSubrepoAct = EricAction( |
1333 self.hgAddSubrepoAct = EricAction( |
1333 self.tr("Add"), |
1334 self.tr("Add"), |
1334 UI.PixmapCache.getIcon("vcsAdd"), |
1335 EricPixmapCache.getIcon("vcsAdd"), |
1335 self.tr("Add..."), |
1336 self.tr("Add..."), |
1336 0, |
1337 0, |
1337 0, |
1338 0, |
1338 self, |
1339 self, |
1339 "mercurial_add_subrepo", |
1340 "mercurial_add_subrepo", |
1347 self.hgAddSubrepoAct.triggered.connect(self.__hgAddSubrepository) |
1348 self.hgAddSubrepoAct.triggered.connect(self.__hgAddSubrepository) |
1348 self.actions.append(self.hgAddSubrepoAct) |
1349 self.actions.append(self.hgAddSubrepoAct) |
1349 |
1350 |
1350 self.hgRemoveSubreposAct = EricAction( |
1351 self.hgRemoveSubreposAct = EricAction( |
1351 self.tr("Remove"), |
1352 self.tr("Remove"), |
1352 UI.PixmapCache.getIcon("vcsRemove"), |
1353 EricPixmapCache.getIcon("vcsRemove"), |
1353 self.tr("Remove..."), |
1354 self.tr("Remove..."), |
1354 0, |
1355 0, |
1355 0, |
1356 0, |
1356 self, |
1357 self, |
1357 "mercurial_remove_subrepos", |
1358 "mercurial_remove_subrepos", |
1366 self.hgRemoveSubreposAct.triggered.connect(self.__hgRemoveSubrepositories) |
1367 self.hgRemoveSubreposAct.triggered.connect(self.__hgRemoveSubrepositories) |
1367 self.actions.append(self.hgRemoveSubreposAct) |
1368 self.actions.append(self.hgRemoveSubreposAct) |
1368 |
1369 |
1369 self.hgArchiveAct = EricAction( |
1370 self.hgArchiveAct = EricAction( |
1370 self.tr("Create unversioned archive"), |
1371 self.tr("Create unversioned archive"), |
1371 UI.PixmapCache.getIcon("vcsExport"), |
1372 EricPixmapCache.getIcon("vcsExport"), |
1372 self.tr("Create unversioned archive..."), |
1373 self.tr("Create unversioned archive..."), |
1373 0, |
1374 0, |
1374 0, |
1375 0, |
1375 self, |
1376 self, |
1376 "mercurial_archive", |
1377 "mercurial_archive", |
1388 self.hgArchiveAct.triggered.connect(self.__hgArchive) |
1389 self.hgArchiveAct.triggered.connect(self.__hgArchive) |
1389 self.actions.append(self.hgArchiveAct) |
1390 self.actions.append(self.hgArchiveAct) |
1390 |
1391 |
1391 self.hgBookmarksListAct = EricAction( |
1392 self.hgBookmarksListAct = EricAction( |
1392 self.tr("List bookmarks"), |
1393 self.tr("List bookmarks"), |
1393 UI.PixmapCache.getIcon("listBookmarks"), |
1394 EricPixmapCache.getIcon("listBookmarks"), |
1394 self.tr("List bookmarks..."), |
1395 self.tr("List bookmarks..."), |
1395 0, |
1396 0, |
1396 0, |
1397 0, |
1397 self, |
1398 self, |
1398 "mercurial_list_bookmarks", |
1399 "mercurial_list_bookmarks", |
1407 self.hgBookmarksListAct.triggered.connect(self.__hgBookmarksList) |
1408 self.hgBookmarksListAct.triggered.connect(self.__hgBookmarksList) |
1408 self.actions.append(self.hgBookmarksListAct) |
1409 self.actions.append(self.hgBookmarksListAct) |
1409 |
1410 |
1410 self.hgBookmarkDefineAct = EricAction( |
1411 self.hgBookmarkDefineAct = EricAction( |
1411 self.tr("Define bookmark"), |
1412 self.tr("Define bookmark"), |
1412 UI.PixmapCache.getIcon("addBookmark"), |
1413 EricPixmapCache.getIcon("addBookmark"), |
1413 self.tr("Define bookmark..."), |
1414 self.tr("Define bookmark..."), |
1414 0, |
1415 0, |
1415 0, |
1416 0, |
1416 self, |
1417 self, |
1417 "mercurial_define_bookmark", |
1418 "mercurial_define_bookmark", |
1428 self.hgBookmarkDefineAct.triggered.connect(self.__hgBookmarkDefine) |
1429 self.hgBookmarkDefineAct.triggered.connect(self.__hgBookmarkDefine) |
1429 self.actions.append(self.hgBookmarkDefineAct) |
1430 self.actions.append(self.hgBookmarkDefineAct) |
1430 |
1431 |
1431 self.hgBookmarkDeleteAct = EricAction( |
1432 self.hgBookmarkDeleteAct = EricAction( |
1432 self.tr("Delete bookmark"), |
1433 self.tr("Delete bookmark"), |
1433 UI.PixmapCache.getIcon("deleteBookmark"), |
1434 EricPixmapCache.getIcon("deleteBookmark"), |
1434 self.tr("Delete bookmark..."), |
1435 self.tr("Delete bookmark..."), |
1435 0, |
1436 0, |
1436 0, |
1437 0, |
1437 self, |
1438 self, |
1438 "mercurial_delete_bookmark", |
1439 "mercurial_delete_bookmark", |
1449 self.hgBookmarkDeleteAct.triggered.connect(self.__hgBookmarkDelete) |
1450 self.hgBookmarkDeleteAct.triggered.connect(self.__hgBookmarkDelete) |
1450 self.actions.append(self.hgBookmarkDeleteAct) |
1451 self.actions.append(self.hgBookmarkDeleteAct) |
1451 |
1452 |
1452 self.hgBookmarkRenameAct = EricAction( |
1453 self.hgBookmarkRenameAct = EricAction( |
1453 self.tr("Rename bookmark"), |
1454 self.tr("Rename bookmark"), |
1454 UI.PixmapCache.getIcon("renameBookmark"), |
1455 EricPixmapCache.getIcon("renameBookmark"), |
1455 self.tr("Rename bookmark..."), |
1456 self.tr("Rename bookmark..."), |
1456 0, |
1457 0, |
1457 0, |
1458 0, |
1458 self, |
1459 self, |
1459 "mercurial_rename_bookmark", |
1460 "mercurial_rename_bookmark", |
1470 self.hgBookmarkRenameAct.triggered.connect(self.__hgBookmarkRename) |
1471 self.hgBookmarkRenameAct.triggered.connect(self.__hgBookmarkRename) |
1471 self.actions.append(self.hgBookmarkRenameAct) |
1472 self.actions.append(self.hgBookmarkRenameAct) |
1472 |
1473 |
1473 self.hgBookmarkMoveAct = EricAction( |
1474 self.hgBookmarkMoveAct = EricAction( |
1474 self.tr("Move bookmark"), |
1475 self.tr("Move bookmark"), |
1475 UI.PixmapCache.getIcon("moveBookmark"), |
1476 EricPixmapCache.getIcon("moveBookmark"), |
1476 self.tr("Move bookmark..."), |
1477 self.tr("Move bookmark..."), |
1477 0, |
1478 0, |
1478 0, |
1479 0, |
1479 self, |
1480 self, |
1480 "mercurial_move_bookmark", |
1481 "mercurial_move_bookmark", |
1490 self.hgBookmarkMoveAct.triggered.connect(self.__hgBookmarkMove) |
1491 self.hgBookmarkMoveAct.triggered.connect(self.__hgBookmarkMove) |
1491 self.actions.append(self.hgBookmarkMoveAct) |
1492 self.actions.append(self.hgBookmarkMoveAct) |
1492 |
1493 |
1493 self.hgBookmarkIncomingAct = EricAction( |
1494 self.hgBookmarkIncomingAct = EricAction( |
1494 self.tr("Show incoming bookmarks"), |
1495 self.tr("Show incoming bookmarks"), |
1495 UI.PixmapCache.getIcon("incomingBookmark"), |
1496 EricPixmapCache.getIcon("incomingBookmark"), |
1496 self.tr("Show incoming bookmarks"), |
1497 self.tr("Show incoming bookmarks"), |
1497 0, |
1498 0, |
1498 0, |
1499 0, |
1499 self, |
1500 self, |
1500 "mercurial_incoming_bookmarks", |
1501 "mercurial_incoming_bookmarks", |
1512 self.hgBookmarkIncomingAct.triggered.connect(self.__hgBookmarkIncoming) |
1513 self.hgBookmarkIncomingAct.triggered.connect(self.__hgBookmarkIncoming) |
1513 self.actions.append(self.hgBookmarkIncomingAct) |
1514 self.actions.append(self.hgBookmarkIncomingAct) |
1514 |
1515 |
1515 self.hgBookmarkPullAct = EricAction( |
1516 self.hgBookmarkPullAct = EricAction( |
1516 self.tr("Pull bookmark"), |
1517 self.tr("Pull bookmark"), |
1517 UI.PixmapCache.getIcon("pullBookmark"), |
1518 EricPixmapCache.getIcon("pullBookmark"), |
1518 self.tr("Pull bookmark"), |
1519 self.tr("Pull bookmark"), |
1519 0, |
1520 0, |
1520 0, |
1521 0, |
1521 self, |
1522 self, |
1522 "mercurial_pull_bookmark", |
1523 "mercurial_pull_bookmark", |
1534 self.hgBookmarkPullAct.triggered.connect(self.__hgBookmarkPull) |
1535 self.hgBookmarkPullAct.triggered.connect(self.__hgBookmarkPull) |
1535 self.actions.append(self.hgBookmarkPullAct) |
1536 self.actions.append(self.hgBookmarkPullAct) |
1536 |
1537 |
1537 self.hgBookmarkPullCurrentAct = EricAction( |
1538 self.hgBookmarkPullCurrentAct = EricAction( |
1538 self.tr("Pull current bookmark"), |
1539 self.tr("Pull current bookmark"), |
1539 UI.PixmapCache.getIcon("pullBookmark"), |
1540 EricPixmapCache.getIcon("pullBookmark"), |
1540 self.tr("Pull current bookmark"), |
1541 self.tr("Pull current bookmark"), |
1541 0, |
1542 0, |
1542 0, |
1543 0, |
1543 self, |
1544 self, |
1544 "mercurial_pull_current_bookmark", |
1545 "mercurial_pull_current_bookmark", |
1555 ) |
1556 ) |
1556 self.hgBookmarkPullCurrentAct.triggered.connect(self.__hgBookmarkPullCurrent) |
1557 self.hgBookmarkPullCurrentAct.triggered.connect(self.__hgBookmarkPullCurrent) |
1557 |
1558 |
1558 self.hgBookmarkOutgoingAct = EricAction( |
1559 self.hgBookmarkOutgoingAct = EricAction( |
1559 self.tr("Show outgoing bookmarks"), |
1560 self.tr("Show outgoing bookmarks"), |
1560 UI.PixmapCache.getIcon("outgoingBookmark"), |
1561 EricPixmapCache.getIcon("outgoingBookmark"), |
1561 self.tr("Show outgoing bookmarks"), |
1562 self.tr("Show outgoing bookmarks"), |
1562 0, |
1563 0, |
1563 0, |
1564 0, |
1564 self, |
1565 self, |
1565 "mercurial_outgoing_bookmarks", |
1566 "mercurial_outgoing_bookmarks", |
1577 self.hgBookmarkOutgoingAct.triggered.connect(self.__hgBookmarkOutgoing) |
1578 self.hgBookmarkOutgoingAct.triggered.connect(self.__hgBookmarkOutgoing) |
1578 self.actions.append(self.hgBookmarkOutgoingAct) |
1579 self.actions.append(self.hgBookmarkOutgoingAct) |
1579 |
1580 |
1580 self.hgBookmarkPushAct = EricAction( |
1581 self.hgBookmarkPushAct = EricAction( |
1581 self.tr("Push bookmark"), |
1582 self.tr("Push bookmark"), |
1582 UI.PixmapCache.getIcon("pushBookmark"), |
1583 EricPixmapCache.getIcon("pushBookmark"), |
1583 self.tr("Push bookmark"), |
1584 self.tr("Push bookmark"), |
1584 0, |
1585 0, |
1585 0, |
1586 0, |
1586 self, |
1587 self, |
1587 "mercurial_push_bookmark", |
1588 "mercurial_push_bookmark", |
1599 self.hgBookmarkPushAct.triggered.connect(self.__hgBookmarkPush) |
1600 self.hgBookmarkPushAct.triggered.connect(self.__hgBookmarkPush) |
1600 self.actions.append(self.hgBookmarkPushAct) |
1601 self.actions.append(self.hgBookmarkPushAct) |
1601 |
1602 |
1602 self.hgBookmarkPushCurrentAct = EricAction( |
1603 self.hgBookmarkPushCurrentAct = EricAction( |
1603 self.tr("Push current bookmark"), |
1604 self.tr("Push current bookmark"), |
1604 UI.PixmapCache.getIcon("pushBookmark"), |
1605 EricPixmapCache.getIcon("pushBookmark"), |
1605 self.tr("Push current bookmark"), |
1606 self.tr("Push current bookmark"), |
1606 0, |
1607 0, |
1607 0, |
1608 0, |
1608 self, |
1609 self, |
1609 "mercurial_push_current_bookmark", |
1610 "mercurial_push_current_bookmark", |
1621 self.hgBookmarkPushCurrentAct.triggered.connect(self.__hgBookmarkPushCurrent) |
1622 self.hgBookmarkPushCurrentAct.triggered.connect(self.__hgBookmarkPushCurrent) |
1622 self.actions.append(self.hgBookmarkPushCurrentAct) |
1623 self.actions.append(self.hgBookmarkPushCurrentAct) |
1623 |
1624 |
1624 self.hgBookmarkPushAllAct = EricAction( |
1625 self.hgBookmarkPushAllAct = EricAction( |
1625 self.tr("Push all bookmarks"), |
1626 self.tr("Push all bookmarks"), |
1626 UI.PixmapCache.getIcon("pushBookmark"), |
1627 EricPixmapCache.getIcon("pushBookmark"), |
1627 self.tr("Push all bookmarks"), |
1628 self.tr("Push all bookmarks"), |
1628 0, |
1629 0, |
1629 0, |
1630 0, |
1630 self, |
1631 self, |
1631 "mercurial_push_all_bookmarks", |
1632 "mercurial_push_all_bookmarks", |
1642 ) |
1643 ) |
1643 self.hgBookmarkPushAllAct.triggered.connect(self.__hgBookmarkPushAll) |
1644 self.hgBookmarkPushAllAct.triggered.connect(self.__hgBookmarkPushAll) |
1644 |
1645 |
1645 self.hgDeleteBackupsAct = EricAction( |
1646 self.hgDeleteBackupsAct = EricAction( |
1646 self.tr("Delete all backups"), |
1647 self.tr("Delete all backups"), |
1647 UI.PixmapCache.getIcon("clearPrivateData"), |
1648 EricPixmapCache.getIcon("clearPrivateData"), |
1648 self.tr("Delete all backups"), |
1649 self.tr("Delete all backups"), |
1649 0, |
1650 0, |
1650 0, |
1651 0, |
1651 self, |
1652 self, |
1652 "mercurial_delete_all_backups", |
1653 "mercurial_delete_all_backups", |
1750 bisectMenu.addAction(self.hgBisectSkipAct) |
1751 bisectMenu.addAction(self.hgBisectSkipAct) |
1751 bisectMenu.addAction(self.hgBisectResetAct) |
1752 bisectMenu.addAction(self.hgBisectResetAct) |
1752 self.subMenus.append(bisectMenu) |
1753 self.subMenus.append(bisectMenu) |
1753 |
1754 |
1754 tagsMenu = QMenu(self.tr("Tags"), menu) |
1755 tagsMenu = QMenu(self.tr("Tags"), menu) |
1755 tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag")) |
1756 tagsMenu.setIcon(EricPixmapCache.getIcon("vcsTag")) |
1756 tagsMenu.setTearOffEnabled(True) |
1757 tagsMenu.setTearOffEnabled(True) |
1757 tagsMenu.addAction(self.vcsTagAct) |
1758 tagsMenu.addAction(self.vcsTagAct) |
1758 tagsMenu.addAction(self.hgTagListAct) |
1759 tagsMenu.addAction(self.hgTagListAct) |
1759 self.subMenus.append(tagsMenu) |
1760 self.subMenus.append(tagsMenu) |
1760 |
1761 |
1761 branchesMenu = QMenu(self.tr("Branches"), menu) |
1762 branchesMenu = QMenu(self.tr("Branches"), menu) |
1762 branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch")) |
1763 branchesMenu.setIcon(EricPixmapCache.getIcon("vcsBranch")) |
1763 branchesMenu.setTearOffEnabled(True) |
1764 branchesMenu.setTearOffEnabled(True) |
1764 branchesMenu.addAction(self.hgBranchAct) |
1765 branchesMenu.addAction(self.hgBranchAct) |
1765 branchesMenu.addAction(self.hgPushBranchAct) |
1766 branchesMenu.addAction(self.hgPushBranchAct) |
1766 branchesMenu.addAction(self.hgCloseBranchAct) |
1767 branchesMenu.addAction(self.hgCloseBranchAct) |
1767 branchesMenu.addAction(self.hgBranchListAct) |
1768 branchesMenu.addAction(self.hgBranchListAct) |
1768 self.subMenus.append(branchesMenu) |
1769 self.subMenus.append(branchesMenu) |
1769 |
1770 |
1770 bookmarksMenu = QMenu(self.tr("Bookmarks"), menu) |
1771 bookmarksMenu = QMenu(self.tr("Bookmarks"), menu) |
1771 bookmarksMenu.setIcon(UI.PixmapCache.getIcon("bookmark22")) |
1772 bookmarksMenu.setIcon(EricPixmapCache.getIcon("bookmark22")) |
1772 bookmarksMenu.setTearOffEnabled(True) |
1773 bookmarksMenu.setTearOffEnabled(True) |
1773 bookmarksMenu.addAction(self.hgBookmarkDefineAct) |
1774 bookmarksMenu.addAction(self.hgBookmarkDefineAct) |
1774 bookmarksMenu.addAction(self.hgBookmarkDeleteAct) |
1775 bookmarksMenu.addAction(self.hgBookmarkDeleteAct) |
1775 bookmarksMenu.addAction(self.hgBookmarkRenameAct) |
1776 bookmarksMenu.addAction(self.hgBookmarkRenameAct) |
1776 bookmarksMenu.addAction(self.hgBookmarkMoveAct) |
1777 bookmarksMenu.addAction(self.hgBookmarkMoveAct) |
1800 self.__extensionMenus[extensionName] = extensionMenu |
1801 self.__extensionMenus[extensionName] = extensionMenu |
1801 self.__extensionsMenu.addMenu(extensionMenu) |
1802 self.__extensionsMenu.addMenu(extensionMenu) |
1802 self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) |
1803 self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) |
1803 |
1804 |
1804 graftMenu = QMenu(self.tr("Copy Changesets"), menu) |
1805 graftMenu = QMenu(self.tr("Copy Changesets"), menu) |
1805 graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft")) |
1806 graftMenu.setIcon(EricPixmapCache.getIcon("vcsGraft")) |
1806 graftMenu.setTearOffEnabled(True) |
1807 graftMenu.setTearOffEnabled(True) |
1807 graftMenu.addAction(self.hgGraftAct) |
1808 graftMenu.addAction(self.hgGraftAct) |
1808 graftMenu.addAction(self.hgGraftContinueAct) |
1809 graftMenu.addAction(self.hgGraftContinueAct) |
1809 if self.vcs.version >= (4, 7, 0): |
1810 if self.vcs.version >= (4, 7, 0): |
1810 graftMenu.addAction(self.hgGraftStopAct) |
1811 graftMenu.addAction(self.hgGraftStopAct) |
1814 subrepoMenu.setTearOffEnabled(True) |
1815 subrepoMenu.setTearOffEnabled(True) |
1815 subrepoMenu.addAction(self.hgAddSubrepoAct) |
1816 subrepoMenu.addAction(self.hgAddSubrepoAct) |
1816 subrepoMenu.addAction(self.hgRemoveSubreposAct) |
1817 subrepoMenu.addAction(self.hgRemoveSubreposAct) |
1817 |
1818 |
1818 mergeMenu = QMenu(self.tr("Merge Changesets"), menu) |
1819 mergeMenu = QMenu(self.tr("Merge Changesets"), menu) |
1819 mergeMenu.setIcon(UI.PixmapCache.getIcon("vcsMerge")) |
1820 mergeMenu.setIcon(EricPixmapCache.getIcon("vcsMerge")) |
1820 mergeMenu.setTearOffEnabled(True) |
1821 mergeMenu.setTearOffEnabled(True) |
1821 mergeMenu.addAction(self.vcsMergeAct) |
1822 mergeMenu.addAction(self.vcsMergeAct) |
1822 mergeMenu.addAction(self.hgShowConflictsAct) |
1823 mergeMenu.addAction(self.hgShowConflictsAct) |
1823 mergeMenu.addAction(self.vcsResolveAct) |
1824 mergeMenu.addAction(self.vcsResolveAct) |
1824 mergeMenu.addAction(self.hgUnresolveAct) |
1825 mergeMenu.addAction(self.hgUnresolveAct) |
1825 mergeMenu.addAction(self.hgReMergeAct) |
1826 mergeMenu.addAction(self.hgReMergeAct) |
1826 mergeMenu.addAction(self.hgCommitMergeAct) |
1827 mergeMenu.addAction(self.hgCommitMergeAct) |
1827 mergeMenu.addAction(self.hgAbortMergeAct) |
1828 mergeMenu.addAction(self.hgAbortMergeAct) |
1828 |
1829 |
1829 act = menu.addAction( |
1830 act = menu.addAction( |
1830 UI.PixmapCache.getIcon( |
1831 EricPixmapCache.getIcon( |
1831 os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.svg") |
1832 os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.svg") |
1832 ), |
1833 ), |
1833 self.vcs.vcsName(), |
1834 self.vcs.vcsName(), |
1834 self._vcsInfoDisplay, |
1835 self._vcsInfoDisplay, |
1835 ) |
1836 ) |
1896 (EricToolBarManager) |
1897 (EricToolBarManager) |
1897 """ |
1898 """ |
1898 self.__toolbarManager = toolbarManager |
1899 self.__toolbarManager = toolbarManager |
1899 |
1900 |
1900 self.__toolbar = QToolBar(self.tr("Mercurial"), ui) |
1901 self.__toolbar = QToolBar(self.tr("Mercurial"), ui) |
1901 self.__toolbar.setIconSize(UI.Config.ToolBarIconSize) |
1902 self.__toolbar.setIconSize(Config.ToolBarIconSize) |
1902 self.__toolbar.setObjectName("MercurialToolbar") |
1903 self.__toolbar.setObjectName("MercurialToolbar") |
1903 self.__toolbar.setToolTip(self.tr("Mercurial")) |
1904 self.__toolbar.setToolTip(self.tr("Mercurial")) |
1904 |
1905 |
1905 self.__toolbar.addAction(self.hgLogBrowserAct) |
1906 self.__toolbar.addAction(self.hgLogBrowserAct) |
1906 self.__toolbar.addAction(self.vcsStatusAct) |
1907 self.__toolbar.addAction(self.vcsStatusAct) |