--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Tue Jan 12 20:03:30 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Wed Jan 13 17:46:13 2021 +0100
@@ -780,22 +780,19 @@
"""
Private slot used to create a new named patch.
"""
- self.vcs.getExtensionObject("mq").hgQueueNewPatch(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueNewPatch()
def __hgQueueRefreshPatch(self):
"""
Private slot used to refresh the current patch.
"""
- self.vcs.getExtensionObject("mq").hgQueueRefreshPatch(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueRefreshPatch()
def __hgQueueRefreshPatchMessage(self):
"""
Private slot used to refresh the current patch and its commit message.
"""
- self.vcs.getExtensionObject("mq").hgQueueRefreshPatch(
- self.project.getProjectPath(), editMessage=True)
+ self.vcs.getExtensionObject("mq").hgQueueRefreshPatch(editMessage=True)
def __hgQueueShowPatch(self):
"""
@@ -808,16 +805,14 @@
"""
Private slot used to show the commit message of the current patch.
"""
- self.vcs.getExtensionObject("mq").hgQueueShowHeader(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueShowHeader()
- def __hgQueuePushPopPatches(self, name, operation, doAll=False,
+ def __hgQueuePushPopPatches(self, operation, doAll=False,
named=False, force=False):
"""
Private method to push patches onto the stack or pop patches off the
stack.
- @param name file/directory name (string)
@param operation operation type to be performed (Queues.POP,
Queues.PUSH, Queues.GOTO)
@param doAll flag indicating to push/pop all (boolean)
@@ -826,7 +821,7 @@
@param force flag indicating a forceful pop (boolean)
"""
shouldReopen = self.vcs.getExtensionObject("mq").hgQueuePushPopPatches(
- name, operation=operation, doAll=doAll, named=named, force=force)
+ operation=operation, doAll=doAll, named=named, force=force)
if shouldReopen:
res = E5MessageBox.yesNo(
None,
@@ -841,7 +836,6 @@
Private slot used to push the next patch onto the stack.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.PUSH, doAll=False, named=False)
def __hgQueuePushPatchForced(self):
@@ -850,7 +844,6 @@
of local changes.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.PUSH, doAll=False, named=False, force=True)
def __hgQueuePushAllPatches(self):
@@ -858,7 +851,6 @@
Private slot used to push all patches onto the stack.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.PUSH, doAll=True, named=False)
def __hgQueuePushAllPatchesForced(self):
@@ -867,7 +859,6 @@
of local changes.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.PUSH, doAll=True, named=False, force=True)
def __hgQueuePushPatches(self):
@@ -876,7 +867,6 @@
one is at the top.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.PUSH, doAll=False, named=True)
def __hgQueuePushPatchesForced(self):
@@ -885,7 +875,6 @@
one is at the top on top of local changes.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.PUSH, doAll=False, named=True, force=True)
def __hgQueuePopPatch(self):
@@ -893,7 +882,6 @@
Private slot used to pop the current patch off the stack.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.POP, doAll=False, named=False)
def __hgQueuePopPatchForced(self):
@@ -902,7 +890,6 @@
any local changes to patched files.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.POP, doAll=False, named=False, force=True)
def __hgQueuePopAllPatches(self):
@@ -910,7 +897,6 @@
Private slot used to pop all patches off the stack.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.POP, doAll=True, named=False)
def __hgQueuePopAllPatchesForced(self):
@@ -919,7 +905,6 @@
any local changes to patched files.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.POP, doAll=True, named=False, force=True)
def __hgQueuePopPatches(self):
@@ -928,7 +913,6 @@
one is at the top.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.POP, doAll=False, named=True)
def __hgQueuePopPatchesForced(self):
@@ -937,7 +921,6 @@
one is at the top forgetting any local changes to patched files.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.POP, doAll=False, named=True, force=True)
def __hgQueueGotoPatch(self):
@@ -946,7 +929,6 @@
is at the top of the stack.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.GOTO, doAll=False, named=True)
def __hgQueueGotoPatchForced(self):
@@ -955,113 +937,98 @@
is at the top of the stack overwriting local changes.
"""
self.__hgQueuePushPopPatches(
- self.project.getProjectPath(),
operation=Queues.GOTO, doAll=False, named=True, force=True)
def __hgQueueListPatches(self):
"""
Private slot used to show a list of applied and unapplied patches.
"""
- self.vcs.getExtensionObject("mq").hgQueueListPatches(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueListPatches()
def __hgQueueFinishAppliedPatches(self):
"""
Private slot used to finish all applied patches.
"""
- self.vcs.getExtensionObject("mq").hgQueueFinishAppliedPatches(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueFinishAppliedPatches()
def __hgQueueRenamePatch(self):
"""
Private slot used to rename a patch.
"""
- self.vcs.getExtensionObject("mq").hgQueueRenamePatch(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueRenamePatch()
def __hgQueueDeletePatch(self):
"""
Private slot used to delete a patch.
"""
- self.vcs.getExtensionObject("mq").hgQueueDeletePatch(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueDeletePatch()
def __hgQueueFoldUnappliedPatches(self):
"""
Private slot used to fold patches into the current patch.
"""
- self.vcs.getExtensionObject("mq").hgQueueFoldUnappliedPatches(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueFoldUnappliedPatches()
def __hgQueueGuardsDefine(self):
"""
Private slot used to define guards for the current or a named patch.
"""
- self.vcs.getExtensionObject("mq").hgQueueGuardsDefine(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueGuardsDefine()
def __hgQueueGuardsDropAll(self):
"""
Private slot used to drop all guards of the current or a named patch.
"""
- self.vcs.getExtensionObject("mq").hgQueueGuardsDropAll(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueGuardsDropAll()
def __hgQueueGuardsList(self):
"""
Private slot used to list the guards for the current or a named patch.
"""
- self.vcs.getExtensionObject("mq").hgQueueGuardsList(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueGuardsList()
def __hgQueueGuardsListAll(self):
"""
Private slot used to list all guards of all patches.
"""
- self.vcs.getExtensionObject("mq").hgQueueGuardsListAll(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueGuardsListAll()
def __hgQueueGuardsSetActive(self):
"""
Private slot used to set the active guards.
"""
- self.vcs.getExtensionObject("mq").hgQueueGuardsSetActive(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueGuardsSetActive()
def __hgQueueGuardsDeactivate(self):
"""
Private slot used to deactivate all active guards.
"""
- self.vcs.getExtensionObject("mq").hgQueueGuardsDeactivate(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueGuardsDeactivate()
def __hgQueueGuardsIdentifyActive(self):
"""
Private slot used to list all active guards.
"""
- self.vcs.getExtensionObject("mq").hgQueueGuardsIdentifyActive(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueGuardsIdentifyActive()
def __hgQueueCreateQueue(self):
"""
Private slot used to create a new queue.
"""
- self.vcs.getExtensionObject("mq").hgQueueCreateRenameQueue(
- self.project.getProjectPath(), True)
+ self.vcs.getExtensionObject("mq").hgQueueCreateRenameQueue(True)
def __hgQueueRenameQueue(self):
"""
Private slot used to rename the active queue.
"""
- self.vcs.getExtensionObject("mq").hgQueueCreateRenameQueue(
- self.project.getProjectPath(), False)
+ self.vcs.getExtensionObject("mq").hgQueueCreateRenameQueue(False)
def __hgQueueDeleteQueue(self):
"""
Private slot used to delete the reference to a queue.
"""
self.vcs.getExtensionObject("mq").hgQueueDeletePurgeActivateQueue(
- self.project.getProjectPath(), Queues.QUEUE_DELETE)
+ Queues.QUEUE_DELETE)
def __hgQueuePurgeQueue(self):
"""
@@ -1069,21 +1036,20 @@
the patch directory.
"""
self.vcs.getExtensionObject("mq").hgQueueDeletePurgeActivateQueue(
- self.project.getProjectPath(), Queues.QUEUE_PURGE)
+ Queues.QUEUE_PURGE)
def __hgQueueActivateQueue(self):
"""
Private slot used to set the active queue.
"""
self.vcs.getExtensionObject("mq").hgQueueDeletePurgeActivateQueue(
- self.project.getProjectPath(), Queues.QUEUE_ACTIVATE)
+ Queues.QUEUE_ACTIVATE)
def __hgQueueListQueues(self):
"""
Private slot used to list available queues.
"""
- self.vcs.getExtensionObject("mq").hgQueueListQueues(
- self.project.getProjectPath())
+ self.vcs.getExtensionObject("mq").hgQueueListQueues()
def __hgQueueInit(self):
"""
