Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- eric7
- changeset 10490
- 527d47826e97
- parent 10439
- 21c28b0f9e41
- child 10491
- acabc60b19a2
equal
deleted
inserted
replaced
| 10489:1800956305ca | 10490:527d47826e97 |
|---|---|
| 886 @param tagName name of the tag | 886 @param tagName name of the tag |
| 887 @type str | 887 @type str |
| 888 @return flag indicating a performed tag action | 888 @return flag indicating a performed tag action |
| 889 @rtype bool | 889 @rtype bool |
| 890 """ | 890 """ |
| 891 from .HgTagDialog import HgTagDialog | 891 from .HgTagDialog import HgTagDialog, HgTagOperation |
| 892 | 892 |
| 893 dlg = HgTagDialog(self.hgGetTagsList(withType=True), revision, tagName) | 893 dlg = HgTagDialog(self.hgGetTagsList(withType=True), revision, tagName) |
| 894 if dlg.exec() == QDialog.DialogCode.Accepted: | 894 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 895 tag, revision, tagOp, force = dlg.getParameters() | 895 tag, revision, tagOp, force = dlg.getParameters() |
| 896 else: | 896 else: |
| 897 return False | 897 return False |
| 898 | 898 |
| 899 args = self.initCommand("tag") | 899 args = self.initCommand("tag") |
| 900 msgPart = "" | 900 msgPart = "" |
| 901 if tagOp in [HgTagDialog.CreateLocalTag, HgTagDialog.DeleteLocalTag]: | 901 if tagOp in (HgTagOperation.CreateLocal, HgTagOperation.DeleteLocal): |
| 902 args.append("--local") | 902 args.append("--local") |
| 903 msgPart = "local " | 903 msgPart = "local " |
| 904 else: | 904 else: |
| 905 msgPart = "global " | 905 msgPart = "global " |
| 906 if tagOp in [HgTagDialog.DeleteGlobalTag, HgTagDialog.DeleteLocalTag]: | 906 if tagOp in (HgTagOperation.DeleteGlobal, HgTagOperation.DeleteLocal): |
| 907 args.append("--remove") | 907 args.append("--remove") |
| 908 if ( | 908 if ( |
| 909 tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag] | 909 tagOp in (HgTagOperation.CreateGlobal, HgTagOperation.CreateLocal) |
| 910 and revision | 910 and revision |
| 911 ): | 911 ): |
| 912 args.append("--rev") | 912 args.append("--rev") |
| 913 args.append(revision) | 913 args.append(revision) |
| 914 if force: | 914 if force: |
| 915 args.append("--force") | 915 args.append("--force") |
| 916 args.append("--message") | 916 args.append("--message") |
| 917 if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]: | 917 if tagOp in (HgTagOperation.CreateGlobal, HgTagOperation.CreateLocal): |
| 918 tag = tag.strip().replace(" ", "_") | 918 tag = tag.strip().replace(" ", "_") |
| 919 args.append("Created {1}tag <{0}>.".format(tag, msgPart)) | 919 args.append("Created {1}tag <{0}>.".format(tag, msgPart)) |
| 920 else: | 920 else: |
| 921 args.append("Removed {1}tag <{0}>.".format(tag, msgPart)) | 921 args.append("Removed {1}tag <{0}>.".format(tag, msgPart)) |
| 922 args.append(tag) | 922 args.append(tag) |
| 3279 @param revision revision to set bookmark for | 3279 @param revision revision to set bookmark for |
| 3280 @type str | 3280 @type str |
| 3281 @param bookmark name of the bookmark | 3281 @param bookmark name of the bookmark |
| 3282 @type str | 3282 @type str |
| 3283 """ | 3283 """ |
| 3284 from .HgBookmarkDialog import HgBookmarkDialog | 3284 from .HgBookmarkDialog import HgBookmarkAction, HgBookmarkDialog |
| 3285 | 3285 |
| 3286 if bool(revision) and bool(bookmark): | 3286 if bool(revision) and bool(bookmark): |
| 3287 ok = True | 3287 ok = True |
| 3288 else: | 3288 else: |
| 3289 dlg = HgBookmarkDialog( | 3289 dlg = HgBookmarkDialog( |
| 3290 HgBookmarkDialog.DEFINE_MODE, | 3290 HgBookmarkAction.DEFINE, |
| 3291 self.hgGetTagsList(), | 3291 self.hgGetTagsList(), |
| 3292 self.hgGetBranchesList(), | 3292 self.hgGetBranchesList(), |
| 3293 self.hgGetBookmarksList(), | 3293 self.hgGetBookmarksList(), |
| 3294 ) | 3294 ) |
| 3295 if dlg.exec() == QDialog.DialogCode.Accepted: | 3295 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 3370 @param revision revision to set bookmark for | 3370 @param revision revision to set bookmark for |
| 3371 @type str | 3371 @type str |
| 3372 @param bookmark name of the bookmark | 3372 @param bookmark name of the bookmark |
| 3373 @type str | 3373 @type str |
| 3374 """ | 3374 """ |
| 3375 from .HgBookmarkDialog import HgBookmarkDialog | 3375 from .HgBookmarkDialog import HgBookmarkAction, HgBookmarkDialog |
| 3376 | 3376 |
| 3377 if bool(revision) and bool(bookmark): | 3377 if bool(revision) and bool(bookmark): |
| 3378 ok = True | 3378 ok = True |
| 3379 else: | 3379 else: |
| 3380 dlg = HgBookmarkDialog( | 3380 dlg = HgBookmarkDialog( |
| 3381 HgBookmarkDialog.MOVE_MODE, | 3381 HgBookmarkAction.MOVE, |
| 3382 self.hgGetTagsList(), | 3382 self.hgGetTagsList(), |
| 3383 self.hgGetBranchesList(), | 3383 self.hgGetBranchesList(), |
| 3384 self.hgGetBookmarksList(), | 3384 self.hgGetBookmarksList(), |
| 3385 ) | 3385 ) |
| 3386 if dlg.exec() == QDialog.DialogCode.Accepted: | 3386 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 3404 | 3404 |
| 3405 def hgBookmarkIncoming(self): | 3405 def hgBookmarkIncoming(self): |
| 3406 """ | 3406 """ |
| 3407 Public method to show a list of incoming bookmarks. | 3407 Public method to show a list of incoming bookmarks. |
| 3408 """ | 3408 """ |
| 3409 from .HgBookmarksInOutDialog import HgBookmarksInOutDialog | 3409 from .HgBookmarksInOutDialog import ( |
| 3410 HgBookmarksInOutDialog, | |
| 3411 HgBookmarksInOutDialogMode, | |
| 3412 ) | |
| 3410 | 3413 |
| 3411 self.bookmarksInOutDlg = HgBookmarksInOutDialog( | 3414 self.bookmarksInOutDlg = HgBookmarksInOutDialog( |
| 3412 self, HgBookmarksInOutDialog.INCOMING | 3415 self, HgBookmarksInOutDialogMode.INCOMING |
| 3413 ) | 3416 ) |
| 3414 self.bookmarksInOutDlg.show() | 3417 self.bookmarksInOutDlg.show() |
| 3415 self.bookmarksInOutDlg.start() | 3418 self.bookmarksInOutDlg.start() |
| 3416 | 3419 |
| 3417 def hgBookmarkOutgoing(self): | 3420 def hgBookmarkOutgoing(self): |
| 3418 """ | 3421 """ |
| 3419 Public method to show a list of outgoing bookmarks. | 3422 Public method to show a list of outgoing bookmarks. |
| 3420 """ | 3423 """ |
| 3421 from .HgBookmarksInOutDialog import HgBookmarksInOutDialog | 3424 from .HgBookmarksInOutDialog import ( |
| 3425 HgBookmarksInOutDialog, | |
| 3426 HgBookmarksInOutDialogMode, | |
| 3427 ) | |
| 3422 | 3428 |
| 3423 self.bookmarksInOutDlg = HgBookmarksInOutDialog( | 3429 self.bookmarksInOutDlg = HgBookmarksInOutDialog( |
| 3424 self, HgBookmarksInOutDialog.OUTGOING | 3430 self, HgBookmarksInOutDialogMode.OUTGOING |
| 3425 ) | 3431 ) |
| 3426 self.bookmarksInOutDlg.show() | 3432 self.bookmarksInOutDlg.show() |
| 3427 self.bookmarksInOutDlg.start() | 3433 self.bookmarksInOutDlg.start() |
| 3428 | 3434 |
| 3429 def __getInOutBookmarks(self, incoming): | 3435 def __getInOutBookmarks(self, incoming): |
