Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Jan 07 19:54:03 2024 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py	Mon Jan 08 11:14:48 2024 +0100
@@ -888,7 +888,7 @@
         @return flag indicating a performed tag action
         @rtype bool
         """
-        from .HgTagDialog import HgTagDialog
+        from .HgTagDialog import HgTagDialog, HgTagOperation
 
         dlg = HgTagDialog(self.hgGetTagsList(withType=True), revision, tagName)
         if dlg.exec() == QDialog.DialogCode.Accepted:
@@ -898,15 +898,15 @@
 
         args = self.initCommand("tag")
         msgPart = ""
-        if tagOp in [HgTagDialog.CreateLocalTag, HgTagDialog.DeleteLocalTag]:
+        if tagOp in (HgTagOperation.CreateLocal, HgTagOperation.DeleteLocal):
             args.append("--local")
             msgPart = "local "
         else:
             msgPart = "global "
-        if tagOp in [HgTagDialog.DeleteGlobalTag, HgTagDialog.DeleteLocalTag]:
+        if tagOp in (HgTagOperation.DeleteGlobal, HgTagOperation.DeleteLocal):
             args.append("--remove")
         if (
-            tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]
+            tagOp in (HgTagOperation.CreateGlobal, HgTagOperation.CreateLocal)
             and revision
         ):
             args.append("--rev")
@@ -914,7 +914,7 @@
         if force:
             args.append("--force")
         args.append("--message")
-        if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]:
+        if tagOp in (HgTagOperation.CreateGlobal, HgTagOperation.CreateLocal):
             tag = tag.strip().replace(" ", "_")
             args.append("Created {1}tag <{0}>.".format(tag, msgPart))
         else:
@@ -3281,13 +3281,13 @@
         @param bookmark name of the bookmark
         @type str
         """
-        from .HgBookmarkDialog import HgBookmarkDialog
+        from .HgBookmarkDialog import HgBookmarkAction, HgBookmarkDialog
 
         if bool(revision) and bool(bookmark):
             ok = True
         else:
             dlg = HgBookmarkDialog(
-                HgBookmarkDialog.DEFINE_MODE,
+                HgBookmarkAction.DEFINE,
                 self.hgGetTagsList(),
                 self.hgGetBranchesList(),
                 self.hgGetBookmarksList(),
@@ -3372,13 +3372,13 @@
         @param bookmark name of the bookmark
         @type str
         """
-        from .HgBookmarkDialog import HgBookmarkDialog
+        from .HgBookmarkDialog import HgBookmarkAction, HgBookmarkDialog
 
         if bool(revision) and bool(bookmark):
             ok = True
         else:
             dlg = HgBookmarkDialog(
-                HgBookmarkDialog.MOVE_MODE,
+                HgBookmarkAction.MOVE,
                 self.hgGetTagsList(),
                 self.hgGetBranchesList(),
                 self.hgGetBookmarksList(),
@@ -3406,10 +3406,13 @@
         """
         Public method to show a list of incoming bookmarks.
         """
-        from .HgBookmarksInOutDialog import HgBookmarksInOutDialog
+        from .HgBookmarksInOutDialog import (
+            HgBookmarksInOutDialog,
+            HgBookmarksInOutDialogMode,
+        )
 
         self.bookmarksInOutDlg = HgBookmarksInOutDialog(
-            self, HgBookmarksInOutDialog.INCOMING
+            self, HgBookmarksInOutDialogMode.INCOMING
         )
         self.bookmarksInOutDlg.show()
         self.bookmarksInOutDlg.start()
@@ -3418,10 +3421,13 @@
         """
         Public method to show a list of outgoing bookmarks.
         """
-        from .HgBookmarksInOutDialog import HgBookmarksInOutDialog
+        from .HgBookmarksInOutDialog import (
+            HgBookmarksInOutDialog,
+            HgBookmarksInOutDialogMode,
+        )
 
         self.bookmarksInOutDlg = HgBookmarksInOutDialog(
-            self, HgBookmarksInOutDialog.OUTGOING
+            self, HgBookmarksInOutDialogMode.OUTGOING
         )
         self.bookmarksInOutDlg.show()
         self.bookmarksInOutDlg.start()