Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Sun Jan 07 19:54:03 2024 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Mon Jan 08 11:14:48 2024 +0100
@@ -13,7 +13,7 @@
 from eric7.EricWidgets import EricMessageBox
 
 from ..HgExtensionProjectHelper import HgExtensionProjectHelper
-from .queues import Queues
+from .queues import QueueOperation, Queues
 
 
 class QueuesProjectHelper(HgExtensionProjectHelper):
@@ -1003,9 +1003,8 @@
         Private method to push patches onto the stack or pop patches off the
         stack.
 
-        @param operation operation type to be performed (Queues.POP,
-            Queues.PUSH, Queues.GOTO)
-        @type int
+        @param operation operation to be performed
+        @type QueueOperation
         @param doAll flag indicating to push/pop all
         @type bool
         @param named flag indicating to push/pop until a named patch
@@ -1031,7 +1030,9 @@
         """
         Private slot used to push the next patch onto the stack.
         """
-        self.__hgQueuePushPopPatches(operation=Queues.PUSH, doAll=False, named=False)
+        self.__hgQueuePushPopPatches(
+            operation=QueueOperation.PUSH, doAll=False, named=False
+        )
 
     def __hgQueuePushPatchForced(self):
         """
@@ -1039,14 +1040,16 @@
         of local changes.
         """
         self.__hgQueuePushPopPatches(
-            operation=Queues.PUSH, doAll=False, named=False, force=True
+            QueueOperation=Queues.PUSH, doAll=False, named=False, force=True
         )
 
     def __hgQueuePushAllPatches(self):
         """
         Private slot used to push all patches onto the stack.
         """
-        self.__hgQueuePushPopPatches(operation=Queues.PUSH, doAll=True, named=False)
+        self.__hgQueuePushPopPatches(
+            operation=QueueOperation.PUSH, doAll=True, named=False
+        )
 
     def __hgQueuePushAllPatchesForced(self):
         """
@@ -1054,7 +1057,7 @@
         of local changes.
         """
         self.__hgQueuePushPopPatches(
-            operation=Queues.PUSH, doAll=True, named=False, force=True
+            operation=QueueOperation.PUSH, doAll=True, named=False, force=True
         )
 
     def __hgQueuePushPatches(self):
@@ -1062,7 +1065,9 @@
         Private slot used to push patches onto the stack until a named
         one is at the top.
         """
-        self.__hgQueuePushPopPatches(operation=Queues.PUSH, doAll=False, named=True)
+        self.__hgQueuePushPopPatches(
+            operation=QueueOperation.PUSH, doAll=False, named=True
+        )
 
     def __hgQueuePushPatchesForced(self):
         """
@@ -1070,14 +1075,16 @@
         one is at the top on top of local changes.
         """
         self.__hgQueuePushPopPatches(
-            operation=Queues.PUSH, doAll=False, named=True, force=True
+            operation=QueueOperation.PUSH, doAll=False, named=True, force=True
         )
 
     def __hgQueuePopPatch(self):
         """
         Private slot used to pop the current patch off the stack.
         """
-        self.__hgQueuePushPopPatches(operation=Queues.POP, doAll=False, named=False)
+        self.__hgQueuePushPopPatches(
+            operation=QueueOperation.POP, doAll=False, named=False
+        )
 
     def __hgQueuePopPatchForced(self):
         """
@@ -1085,14 +1092,16 @@
         any local changes to patched files.
         """
         self.__hgQueuePushPopPatches(
-            operation=Queues.POP, doAll=False, named=False, force=True
+            operation=QueueOperation.POP, doAll=False, named=False, force=True
         )
 
     def __hgQueuePopAllPatches(self):
         """
         Private slot used to pop all patches off the stack.
         """
-        self.__hgQueuePushPopPatches(operation=Queues.POP, doAll=True, named=False)
+        self.__hgQueuePushPopPatches(
+            operation=QueueOperation.POP, doAll=True, named=False
+        )
 
     def __hgQueuePopAllPatchesForced(self):
         """
@@ -1100,7 +1109,7 @@
         any local changes to patched files.
         """
         self.__hgQueuePushPopPatches(
-            operation=Queues.POP, doAll=True, named=False, force=True
+            operation=QueueOperation.POP, doAll=True, named=False, force=True
         )
 
     def __hgQueuePopPatches(self):
@@ -1108,7 +1117,9 @@
         Private slot used to pop patches off the stack until a named
         one is at the top.
         """
-        self.__hgQueuePushPopPatches(operation=Queues.POP, doAll=False, named=True)
+        self.__hgQueuePushPopPatches(
+            operation=QueueOperation.POP, doAll=False, named=True
+        )
 
     def __hgQueuePopPatchesForced(self):
         """
@@ -1116,7 +1127,7 @@
         one is at the top forgetting any local changes to patched files.
         """
         self.__hgQueuePushPopPatches(
-            operation=Queues.POP, doAll=False, named=True, force=True
+            operation=QueueOperation.POP, doAll=False, named=True, force=True
         )
 
     def __hgQueueGotoPatch(self):
@@ -1124,7 +1135,9 @@
         Private slot used to push or pop patches until the a named one
         is at the top of the stack.
         """
-        self.__hgQueuePushPopPatches(operation=Queues.GOTO, doAll=False, named=True)
+        self.__hgQueuePushPopPatches(
+            operation=QueueOperation.GOTO, doAll=False, named=True
+        )
 
     def __hgQueueGotoPatchForced(self):
         """
@@ -1132,7 +1145,7 @@
         is at the top of the stack overwriting local changes.
         """
         self.__hgQueuePushPopPatches(
-            operation=Queues.GOTO, doAll=False, named=True, force=True
+            operation=QueueOperation.GOTO, doAll=False, named=True, force=True
         )
 
     def __hgQueueListPatches(self):
@@ -1224,7 +1237,7 @@
         Private slot used to delete the reference to a queue.
         """
         self.vcs.getExtensionObject("mq").hgQueueDeletePurgeActivateQueue(
-            Queues.QUEUE_DELETE
+            QueueOperation.DELETE
         )
 
     def __hgQueuePurgeQueue(self):
@@ -1233,7 +1246,7 @@
         the patch directory.
         """
         self.vcs.getExtensionObject("mq").hgQueueDeletePurgeActivateQueue(
-            Queues.QUEUE_PURGE
+            QueueOperation.PURGE
         )
 
     def __hgQueueActivateQueue(self):
@@ -1241,7 +1254,7 @@
         Private slot used to set the active queue.
         """
         self.vcs.getExtensionObject("mq").hgQueueDeletePurgeActivateQueue(
-            Queues.QUEUE_ACTIVATE
+            QueueOperation.ACTIVATE
         )
 
     def __hgQueueListQueues(self):