diff -r 62eff8b34a8d -r c4ee8a81584c eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Jan 12 17:19:02 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Jan 12 20:03:30 2021 +0100
@@ -1308,8 +1308,7 @@
self.hgBookmarkOutgoingAct.setEnabled(self.vcs.canPush())
if self.vcs.version >= (3, 8):
self.hgBookmarkPushCurrentAct.setEnabled(self.vcs.canPull())
- self.hgCommitMergeAct.setEnabled(
- self.vcs.canCommitMerge(self.project.ppath))
+ self.hgCommitMergeAct.setEnabled(self.vcs.canCommitMerge())
def initMenu(self, menu):
"""
@@ -1654,20 +1653,20 @@
Private slot used to show the log of changes coming into the
repository.
"""
- self.vcs.hgIncoming(self.project.ppath)
+ self.vcs.hgIncoming()
def __hgOutgoing(self):
"""
Private slot used to show the log of changes going out of the
repository.
"""
- self.vcs.hgOutgoing(self.project.ppath)
+ self.vcs.hgOutgoing()
def __hgPull(self):
"""
Private slot used to pull changes from a remote repository.
"""
- shouldReopen = self.vcs.hgPull(self.project.ppath)
+ shouldReopen = self.vcs.hgPull()
if shouldReopen:
res = E5MessageBox.yesNo(
self.parent(),
@@ -1681,32 +1680,32 @@
"""
Private slot used to push changes to a remote repository.
"""
- self.vcs.hgPush(self.project.ppath)
+ self.vcs.hgPush()
def __hgPushForced(self):
"""
Private slot used to push changes to a remote repository using
the force option.
"""
- self.vcs.hgPush(self.project.ppath, force=True)
+ self.vcs.hgPush(force=True)
def __hgHeads(self):
"""
Private slot used to show the heads of the repository.
"""
- self.vcs.hgInfo(self.project.ppath, mode="heads")
+ self.vcs.hgInfo(mode="heads")
def __hgParents(self):
"""
Private slot used to show the parents of the repository.
"""
- self.vcs.hgInfo(self.project.ppath, mode="parents")
+ self.vcs.hgInfo(mode="parents")
def __hgTip(self):
"""
Private slot used to show the tip of the repository.
"""
- self.vcs.hgInfo(self.project.ppath, mode="tip")
+ self.vcs.hgInfo(mode="tip")
def __hgResolved(self):
"""
@@ -1732,13 +1731,13 @@
"""
Private slot used to abort an uncommitted merge.
"""
- self.vcs.hgAbortMerge(self.project.ppath)
+ self.vcs.hgAbortMerge()
def __hgShowConflicts(self):
"""
Private slot used to list all files with conflicts.
"""
- self.vcs.hgConflicts(self.project.ppath)
+ self.vcs.hgConflicts()
def __hgReMerge(self):
"""
@@ -1750,25 +1749,25 @@
"""
Private slot used to list the tags of the project.
"""
- self.vcs.hgListTagBranch(self.project.ppath, True)
+ self.vcs.hgListTagBranch(True)
def __hgBranchList(self):
"""
Private slot used to list the branches of the project.
"""
- self.vcs.hgListTagBranch(self.project.ppath, False)
+ self.vcs.hgListTagBranch(False)
def __hgBranch(self):
"""
Private slot used to create a new branch for the project.
"""
- self.vcs.hgBranch(self.project.ppath)
+ self.vcs.hgBranch()
def __hgShowBranch(self):
"""
Private slot used to show the current branch for the project.
"""
- self.vcs.hgShowBranch(self.project.ppath)
+ self.vcs.hgShowBranch()
def __hgConfigure(self):
"""
@@ -1790,7 +1789,7 @@
"""
Private slot to push a new named branch.
"""
- self.vcs.hgPush(self.project.ppath, newBranch=True)
+ self.vcs.hgPush(newBranch=True)
def __hgEditUserConfig(self):
"""
@@ -1808,31 +1807,31 @@
"""
Private slot used to show the combined configuration.
"""
- self.vcs.hgShowConfig(self.project.ppath)
+ self.vcs.hgShowConfig()
def __hgVerify(self):
"""
Private slot used to verify the integrity of the repository.
"""
- self.vcs.hgVerify(self.project.ppath)
+ self.vcs.hgVerify()
def __hgShowPaths(self):
"""
Private slot used to show the aliases for remote repositories.
"""
- self.vcs.hgShowPaths(self.project.ppath)
+ self.vcs.hgShowPaths()
def __hgRecover(self):
"""
Private slot used to recover from an interrupted transaction.
"""
- self.vcs.hgRecover(self.project.ppath)
+ self.vcs.hgRecover()
def __hgIdentify(self):
"""
Private slot used to identify the project directory.
"""
- self.vcs.hgIdentify(self.project.ppath)
+ self.vcs.hgIdentify()
def __hgCreateIgnore(self):
"""
@@ -1844,19 +1843,19 @@
"""
Private slot used to create a changegroup file.
"""
- self.vcs.hgBundle(self.project.ppath)
+ self.vcs.hgBundle()
def __hgPreviewBundle(self):
"""
Private slot used to preview a changegroup file.
"""
- self.vcs.hgPreviewBundle(self.project.ppath)
+ self.vcs.hgPreviewBundle()
def __hgUnbundle(self):
"""
Private slot used to apply changegroup files.
"""
- shouldReopen = self.vcs.hgUnbundle(self.project.ppath)
+ shouldReopen = self.vcs.hgUnbundle()
if shouldReopen:
res = E5MessageBox.yesNo(
self.parent(),
@@ -1870,37 +1869,37 @@
"""
Private slot used to execute the bisect --good command.
"""
- self.vcs.hgBisect(self.project.ppath, "good")
+ self.vcs.hgBisect("good")
def __hgBisectBad(self):
"""
Private slot used to execute the bisect --bad command.
"""
- self.vcs.hgBisect(self.project.ppath, "bad")
+ self.vcs.hgBisect("bad")
def __hgBisectSkip(self):
"""
Private slot used to execute the bisect --skip command.
"""
- self.vcs.hgBisect(self.project.ppath, "skip")
+ self.vcs.hgBisect("skip")
def __hgBisectReset(self):
"""
Private slot used to execute the bisect --reset command.
"""
- self.vcs.hgBisect(self.project.ppath, "reset")
+ self.vcs.hgBisect("reset")
def __hgBackout(self):
"""
Private slot used to back out changes of a changeset.
"""
- self.vcs.hgBackout(self.project.ppath)
+ self.vcs.hgBackout()
def __hgRollback(self):
"""
Private slot used to rollback the last transaction.
"""
- self.vcs.hgRollback(self.project.ppath)
+ self.vcs.hgRollback()
def __hgServe(self):
"""
@@ -1912,7 +1911,7 @@
"""
Private slot used to import a patch file.
"""
- shouldReopen = self.vcs.hgImport(self.project.ppath)
+ shouldReopen = self.vcs.hgImport()
if shouldReopen:
res = E5MessageBox.yesNo(
self.parent(),
@@ -1926,7 +1925,7 @@
"""
Private slot used to export revisions to patch files.
"""
- self.vcs.hgExport(self.project.ppath)
+ self.vcs.hgExport()
def __hgRevert(self):
"""
@@ -1946,13 +1945,13 @@
"""
Private slot used to change the phase of revisions.
"""
- self.vcs.hgPhase(self.project.ppath)
+ self.vcs.hgPhase()
def __hgGraft(self):
"""
Private slot used to copy changesets from another branch.
"""
- shouldReopen = self.vcs.hgGraft(self.project.getProjectPath())
+ shouldReopen = self.vcs.hgGraft()
if shouldReopen:
res = E5MessageBox.yesNo(
None,
@@ -1967,7 +1966,7 @@
Private slot used to continue the last copying session after conflicts
were resolved.
"""
- shouldReopen = self.vcs.hgGraftContinue(self.project.getProjectPath())
+ shouldReopen = self.vcs.hgGraftContinue()
if shouldReopen:
res = E5MessageBox.yesNo(
None,
@@ -1981,7 +1980,7 @@
"""
Private slot used to stop an interrupted copying session.
"""
- shouldReopen = self.vcs.hgGraftStop(self.project.getProjectPath())
+ shouldReopen = self.vcs.hgGraftStop()
if shouldReopen:
res = E5MessageBox.yesNo(
None,
@@ -1996,7 +1995,7 @@
Private slot used to abort an interrupted copying session and perform
a rollback.
"""
- shouldReopen = self.vcs.hgGraftAbort(self.project.getProjectPath())
+ shouldReopen = self.vcs.hgGraftAbort()
if shouldReopen:
res = E5MessageBox.yesNo(
None,
@@ -2034,68 +2033,68 @@
"""
Private slot used to list the bookmarks.
"""
- self.vcs.hgListBookmarks(self.project.getProjectPath())
+ self.vcs.hgListBookmarks()
def __hgBookmarkDefine(self):
"""
Private slot used to define a bookmark.
"""
- self.vcs.hgBookmarkDefine(self.project.getProjectPath())
+ self.vcs.hgBookmarkDefine()
def __hgBookmarkDelete(self):
"""
Private slot used to delete a bookmark.
"""
- self.vcs.hgBookmarkDelete(self.project.getProjectPath())
+ self.vcs.hgBookmarkDelete()
def __hgBookmarkRename(self):
"""
Private slot used to rename a bookmark.
"""
- self.vcs.hgBookmarkRename(self.project.getProjectPath())
+ self.vcs.hgBookmarkRename()
def __hgBookmarkMove(self):
"""
Private slot used to move a bookmark.
"""
- self.vcs.hgBookmarkMove(self.project.getProjectPath())
+ self.vcs.hgBookmarkMove()
def __hgBookmarkIncoming(self):
"""
Private slot used to show a list of incoming bookmarks.
"""
- self.vcs.hgBookmarkIncoming(self.project.getProjectPath())
+ self.vcs.hgBookmarkIncoming()
def __hgBookmarkOutgoing(self):
"""
Private slot used to show a list of outgoing bookmarks.
"""
- self.vcs.hgBookmarkOutgoing(self.project.getProjectPath())
+ self.vcs.hgBookmarkOutgoing()
def __hgBookmarkPull(self):
"""
Private slot used to pull a bookmark from a remote repository.
"""
- self.vcs.hgBookmarkPull(self.project.getProjectPath())
+ self.vcs.hgBookmarkPull()
def __hgBookmarkPullCurrent(self):
"""
Private slot used to pull the current bookmark from a remote
repository.
"""
- self.vcs.hgBookmarkPull(self.project.getProjectPath(), current=True)
+ self.vcs.hgBookmarkPull(current=True)
def __hgBookmarkPush(self):
"""
Private slot used to push a bookmark to a remote repository.
"""
- self.vcs.hgBookmarkPush(self.project.getProjectPath())
+ self.vcs.hgBookmarkPush()
def __hgBookmarkPushCurrent(self):
"""
Private slot used to push the current bookmark to a remote repository.
"""
- self.vcs.hgBookmarkPush(self.project.getProjectPath(), current=True)
+ self.vcs.hgBookmarkPush(current=True)
def __hgDeleteBackups(self):
"""
