diff -r ecf67e07b6e0 -r 72b88fb20261 eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Dec 19 15:06:20 2020 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Dec 19 15:22:26 2020 +0100
@@ -399,9 +399,9 @@
strings)
@param message message for this operation (string)
@param noDialog flag indicating quiet operations
- @keyparam closeBranch flag indicating a close branch commit (boolean)
- @keyparam mq flag indicating a queue commit (boolean)
- @keyparam merge flag indicating a merge commit (boolean)
+ @param closeBranch flag indicating a close branch commit (boolean)
+ @param mq flag indicating a queue commit (boolean)
+ @param merge flag indicating a merge commit (boolean)
"""
msg = message
@@ -584,7 +584,7 @@
@param name file/directory name to be updated (string or list of
strings)
@param noDialog flag indicating quiet operations (boolean)
- @keyparam revision revision to update to (string)
+ @param revision revision to update to (string)
@return flag indicating, that the update contained an add
or delete (boolean)
"""
@@ -987,7 +987,7 @@
@param name file/directory name to be merged
@type str
- @keyparam rev revision to merge with
+ @param rev revision to merge with
@type str
"""
dname, fname = self.splitPath(name)
@@ -1642,7 +1642,7 @@
repository.
@param name file name to get from the repository (string)
- @keyparam rev revision to retrieve (string)
+ @param rev revision to retrieve (string)
@return contents of the file (string) and an error message (string)
"""
args = self.initCommand("cat")
@@ -1662,8 +1662,8 @@
repository side-by-side.
@param name file name to be diffed (string)
- @keyparam extended flag indicating the extended variant (boolean)
- @keyparam revisions tuple of two revisions (tuple of strings)
+ @param extended flag indicating the extended variant (boolean)
+ @param revisions tuple of two revisions (tuple of strings)
@exception ValueError raised to indicate an invalid name parameter
"""
if isinstance(name, list):
@@ -1735,7 +1735,7 @@
Mercurial repository.
@param name file/directory name to show the log of (string)
- @keyparam isFile flag indicating log for a file is to be shown
+ @param isFile flag indicating log for a file is to be shown
(boolean)
"""
if self.logBrowser is None:
@@ -1836,9 +1836,9 @@
Public method used to push changes to a remote Mercurial repository.
@param name directory name of the project to be pushed from (string)
- @keyparam force flag indicating a forced push (boolean)
- @keyparam newBranch flag indicating to push a new branch (boolean)
- @keyparam rev revision to be pushed (including all ancestors) (string)
+ @param force flag indicating a forced push (boolean)
+ @param newBranch flag indicating to push a new branch (boolean)
+ @param rev revision to be pushed (including all ancestors) (string)
"""
args = self.initCommand("push")
args.append('-v')
@@ -1869,7 +1869,7 @@
Public method to show information about the heads of the repository.
@param ppath local path to get the repository infos (string)
- @keyparam mode mode of the operation (string, one of heads, parents,
+ @param mode mode of the operation (string, one of heads, parents,
tip)
"""
if mode not in ("heads", "parents", "tip"):
