--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Aug 04 15:38:32 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Aug 04 15:39:15 2018 +0200 @@ -89,6 +89,9 @@ <td><a href="#Hg.__hgGetFileForRevision">__hgGetFileForRevision</a></td> <td>Private method to get a file for a specific revision from the repository.</td> </tr><tr> +<td><a href="#Hg.__hgGraftSubCommand">__hgGraftSubCommand</a></td> +<td>Private method to perform a Mercurial graft subcommand.</td> +</tr><tr> <td><a href="#Hg.__iniFileChanged">__iniFileChanged</a></td> <td>Private slot to handle a change of the Mercurial configuration file.</td> </tr><tr> @@ -218,9 +221,15 @@ <td><a href="#Hg.hgGraft">hgGraft</a></td> <td>Public method to copy changesets from another branch.</td> </tr><tr> +<td><a href="#Hg.hgGraftAbort">hgGraftAbort</a></td> +<td>Public method to abort an interrupted copying session and perform a rollback.</td> +</tr><tr> <td><a href="#Hg.hgGraftContinue">hgGraftContinue</a></td> <td>Public method to continue copying changesets from another branch.</td> </tr><tr> +<td><a href="#Hg.hgGraftStop">hgGraftStop</a></td> +<td>Public method to stop an interrupted copying session.</td> +</tr><tr> <td><a href="#Hg.hgIdentify">hgIdentify</a></td> <td>Public method to identify the current working directory.</td> </tr><tr> @@ -493,6 +502,32 @@ <dd> contents of the file (string) and an error message (string) </dd> +</dl><a NAME="Hg.__hgGraftSubCommand" ID="Hg.__hgGraftSubCommand"></a> +<h4>Hg.__hgGraftSubCommand</h4> +<b>__hgGraftSubCommand</b>(<i>path, subcommand, title</i>) +<p> + Private method to perform a Mercurial graft subcommand. +</p><dl> +<dt><i>path</i> (str)</dt> +<dd> +directory name of the project +</dd><dt><i>subcommand</i> (str)</dt> +<dd> +subcommand flag +</dd><dt><i>title</i> (str)</dt> +<dd> +tirle of the dialog +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> </dl><a NAME="Hg.__iniFileChanged" ID="Hg.__iniFileChanged"></a> <h4>Hg.__iniFileChanged</h4> <b>__iniFileChanged</b>(<i>path</i>) @@ -1033,20 +1068,66 @@ <dd> flag indicating that the project should be reread (boolean) </dd> +</dl><a NAME="Hg.hgGraftAbort" ID="Hg.hgGraftAbort"></a> +<h4>Hg.hgGraftAbort</h4> +<b>hgGraftAbort</b>(<i>path</i>) +<p> + Public method to abort an interrupted copying session and perform + a rollback. +</p><dl> +<dt><i>path</i> (str)</dt> +<dd> +directory name of the project +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> </dl><a NAME="Hg.hgGraftContinue" ID="Hg.hgGraftContinue"></a> <h4>Hg.hgGraftContinue</h4> <b>hgGraftContinue</b>(<i>path</i>) <p> Public method to continue copying changesets from another branch. </p><dl> -<dt><i>path</i></dt> +<dt><i>path</i> (str)</dt> <dd> -directory name of the project (string) +directory name of the project </dd> </dl><dl> <dt>Returns:</dt> <dd> -flag indicating that the project should be reread (boolean) +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="Hg.hgGraftStop" ID="Hg.hgGraftStop"></a> +<h4>Hg.hgGraftStop</h4> +<b>hgGraftStop</b>(<i>path</i>) +<p> + Public method to stop an interrupted copying session. +</p><dl> +<dt><i>path</i> (str)</dt> +<dd> +directory name of the project +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl><a NAME="Hg.hgIdentify" ID="Hg.hgIdentify"></a> <h4>Hg.hgIdentify</h4>