--- a/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsPySvn.subversion.html Wed Sep 22 18:20:06 2021 +0200 +++ b/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsPySvn.subversion.html Wed Sep 22 19:52:28 2021 +0200 @@ -175,14 +175,6 @@ <td>Public method to open the repository browser.</td> </tr> <tr> -<td><a href="#Subversion.svnResolve">svnResolve</a></td> -<td>Public method used to resolve conflicts of a file/directory.</td> -</tr> -<tr> -<td><a href="#Subversion.svnSbsDiff">svnSbsDiff</a></td> -<td>Public method used to view the difference of a file to the Mercurial repository side-by-side.</td> -</tr> -<tr> <td><a href="#Subversion.svnSetProp">svnSetProp</a></td> <td>Public method used to add a property to a file/directory.</td> </tr> @@ -251,6 +243,10 @@ <td>Public method used to export a directory from the Subversion repository.</td> </tr> <tr> +<td><a href="#Subversion.vcsForget">vcsForget</a></td> +<td>Public method used to remove a file from the repository.</td> +</tr> +<tr> <td><a href="#Subversion.vcsGetProjectBrowserHelper">vcsGetProjectBrowserHelper</a></td> <td>Public method to instanciate a helper object for the different project browsers.</td> </tr> @@ -307,10 +303,18 @@ <td>Public method to retrieve information about the repository.</td> </tr> <tr> +<td><a href="#Subversion.vcsResolved">vcsResolved</a></td> +<td>Public method used to resolve conflicts of a file/directory.</td> +</tr> +<tr> <td><a href="#Subversion.vcsRevert">vcsRevert</a></td> <td>Public method used to revert changes made to a file/directory.</td> </tr> <tr> +<td><a href="#Subversion.vcsSbsDiff">vcsSbsDiff</a></td> +<td>Public method used to view the difference of a file to the Mercurial repository side-by-side.</td> +</tr> +<tr> <td><a href="#Subversion.vcsShutdown">vcsShutdown</a></td> <td>Public method used to shutdown the Subversion interface.</td> </tr> @@ -894,50 +898,6 @@ path name of the project (string) </dd> </dl> -<a NAME="Subversion.svnResolve" ID="Subversion.svnResolve"></a> -<h4>Subversion.svnResolve</h4> -<b>svnResolve</b>(<i>name</i>) - -<p> - Public method used to resolve conflicts of a file/directory. -</p> -<dl> - -<dt><i>name</i></dt> -<dd> -file/directory name to be resolved (string) -</dd> -</dl> -<a NAME="Subversion.svnSbsDiff" ID="Subversion.svnSbsDiff"></a> -<h4>Subversion.svnSbsDiff</h4> -<b>svnSbsDiff</b>(<i>name, extended=False, revisions=None</i>) - -<p> - Public method used to view the difference of a file to the Mercurial - repository side-by-side. -</p> -<dl> - -<dt><i>name</i></dt> -<dd> -file name to be diffed (string) -</dd> -<dt><i>extended</i></dt> -<dd> -flag indicating the extended variant (boolean) -</dd> -<dt><i>revisions</i></dt> -<dd> -tuple of two revisions (tuple of strings) -</dd> -</dl> -<dl> - -<dt>Raises <b>ValueError</b>:</dt> -<dd> -raised to indicate an invalid name parameter type -</dd> -</dl> <a NAME="Subversion.svnSetProp" ID="Subversion.svnSetProp"></a> <h4>Subversion.svnSetProp</h4> <b>svnSetProp</b>(<i>name, recursive=False</i>) @@ -1289,6 +1249,24 @@ flag indicating an execution without errors (boolean) </dd> </dl> +<a NAME="Subversion.vcsForget" ID="Subversion.vcsForget"></a> +<h4>Subversion.vcsForget</h4> +<b>vcsForget</b>(<i>name</i>) + +<p> + Public method used to remove a file from the repository. +</p> +<p> + Note: svn does not support this operation. The method is implemented + as a NoOp. +</p> +<dl> + +<dt><i>name</i> (str or list of str)</dt> +<dd> +file/directory name to be removed +</dd> +</dl> <a NAME="Subversion.vcsGetProjectBrowserHelper" ID="Subversion.vcsGetProjectBrowserHelper"></a> <h4>Subversion.vcsGetProjectBrowserHelper</h4> <b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser=False</i>) @@ -1633,6 +1611,20 @@ string with ready formated info for display (string) </dd> </dl> +<a NAME="Subversion.vcsResolved" ID="Subversion.vcsResolved"></a> +<h4>Subversion.vcsResolved</h4> +<b>vcsResolved</b>(<i>name</i>) + +<p> + Public method used to resolve conflicts of a file/directory. +</p> +<dl> + +<dt><i>name</i></dt> +<dd> +file/directory name to be resolved (string) +</dd> +</dl> <a NAME="Subversion.vcsRevert" ID="Subversion.vcsRevert"></a> <h4>Subversion.vcsRevert</h4> <b>vcsRevert</b>(<i>name</i>) @@ -1642,9 +1634,52 @@ </p> <dl> +<dt><i>name</i> (str)</dt> +<dd> +file/directory name to be reverted +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +flag indicating, that the update contained an add + or delete +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<a NAME="Subversion.vcsSbsDiff" ID="Subversion.vcsSbsDiff"></a> +<h4>Subversion.vcsSbsDiff</h4> +<b>vcsSbsDiff</b>(<i>name, extended=False, revisions=None</i>) + +<p> + Public method used to view the difference of a file to the Mercurial + repository side-by-side. +</p> +<dl> + <dt><i>name</i></dt> <dd> -file/directory name to be reverted (string) +file name to be diffed (string) +</dd> +<dt><i>extended</i></dt> +<dd> +flag indicating the extended variant (boolean) +</dd> +<dt><i>revisions</i></dt> +<dd> +tuple of two revisions (tuple of strings) +</dd> +</dl> +<dl> + +<dt>Raises <b>ValueError</b>:</dt> +<dd> +raised to indicate an invalid name parameter type </dd> </dl> <a NAME="Subversion.vcsShutdown" ID="Subversion.vcsShutdown"></a>