Mercurial Repositories > eric / file diff

diff: eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html

eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html

branch
eric7
changeset 8623
fced5aa98d41
parent 8596
d64760b2da50
child 8652
8cacde11f4fd
--- a/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html	Wed Sep 22 18:20:06 2021 +0200
+++ b/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html	Wed Sep 22 19:52:28 2021 +0200
@@ -257,10 +257,6 @@
 <td>Public method used to view the difference of a file/directory to the Mercurial repository.</td>
 </tr>
 <tr>
-<td><a href="#Hg.hgForget">hgForget</a></td>
-<td>Public method used to remove a file from the Mercurial repository.</td>
-</tr>
-<tr>
 <td><a href="#Hg.hgGetBookmarksList">hgGetBookmarksList</a></td>
 <td>Public method to get the list of bookmarks.</td>
 </tr>
@@ -353,22 +349,10 @@
 <td>Public method to remove sub-repositories.</td>
 </tr>
 <tr>
-<td><a href="#Hg.hgResolved">hgResolved</a></td>
-<td>Public method used to resolve conflicts of a file/directory.</td>
-</tr>
-<tr>
-<td><a href="#Hg.hgRevert">hgRevert</a></td>
-<td>Public method used to revert changes made to a file/directory.</td>
-</tr>
-<tr>
 <td><a href="#Hg.hgRollback">hgRollback</a></td>
 <td>Public method used to rollback the last transaction.</td>
 </tr>
 <tr>
-<td><a href="#Hg.hgSbsDiff">hgSbsDiff</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="#Hg.hgServe">hgServe</a></td>
 <td>Public method used to serve the project.</td>
 </tr>
@@ -457,6 +441,10 @@
 <td>Public method used to export a directory from the Mercurial repository.</td>
 </tr>
 <tr>
+<td><a href="#Hg.vcsForget">vcsForget</a></td>
+<td>Public method used to remove a file from the Mercurial repository.</td>
+</tr>
+<tr>
 <td><a href="#Hg.vcsGetProjectBrowserHelper">vcsGetProjectBrowserHelper</a></td>
 <td>Public method to instantiate a helper object for the different project browsers.</td>
 </tr>
@@ -513,6 +501,18 @@
 <td>Public method to retrieve information about the repository.</td>
 </tr>
 <tr>
+<td><a href="#Hg.vcsResolved">vcsResolved</a></td>
+<td>Public method used to resolve conflicts of a file/directory.</td>
+</tr>
+<tr>
+<td><a href="#Hg.vcsRevert">vcsRevert</a></td>
+<td>Public method used to revert changes made to a file/directory.</td>
+</tr>
+<tr>
+<td><a href="#Hg.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="#Hg.vcsShutdown">vcsShutdown</a></td>
 <td>Public method used to shutdown the Mercurial interface.</td>
 </tr>
@@ -1228,24 +1228,6 @@
 file/directory name to be diffed (string)
 </dd>
 </dl>
-<a NAME="Hg.hgForget" ID="Hg.hgForget"></a>
-<h4>Hg.hgForget</h4>
-<b>hgForget</b>(<i>name</i>)
-
-<p>
-        Public method used to remove a file from the Mercurial repository.
-</p>
-<p>
-        This will not remove the file from the project directory.
-</p>
-<dl>
-
-<dt><i>name</i></dt>
-<dd>
-file/directory name to be removed (string or list of
-            strings))
-</dd>
-</dl>
 <a NAME="Hg.hgGetBookmarksList" ID="Hg.hgGetBookmarksList"></a>
 <h4>Hg.hgGetBookmarksList</h4>
 <b>hgGetBookmarksList</b>(<i></i>)
@@ -1620,46 +1602,6 @@
 <p>
         Public method to remove sub-repositories.
 </p>
-<a NAME="Hg.hgResolved" ID="Hg.hgResolved"></a>
-<h4>Hg.hgResolved</h4>
-<b>hgResolved</b>(<i>name, unresolve=False</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>
-<dt><i>unresolve</i></dt>
-<dd>
-flag indicating to mark the file/directory as
-            unresolved (boolean)
-</dd>
-</dl>
-<a NAME="Hg.hgRevert" ID="Hg.hgRevert"></a>
-<h4>Hg.hgRevert</h4>
-<b>hgRevert</b>(<i>name</i>)
-
-<p>
-        Public method used to revert changes made to a file/directory.
-</p>
-<dl>
-
-<dt><i>name</i></dt>
-<dd>
-file/directory name to be reverted (string)
-</dd>
-</dl>
-<dl>
-<dt>Return:</dt>
-<dd>
-flag indicating, that the update contained an add
-            or delete (boolean)
-</dd>
-</dl>
 <a NAME="Hg.hgRollback" ID="Hg.hgRollback"></a>
 <h4>Hg.hgRollback</h4>
 <b>hgRollback</b>(<i></i>)
@@ -1667,36 +1609,6 @@
 <p>
         Public method used to rollback the last transaction.
 </p>
-<a NAME="Hg.hgSbsDiff" ID="Hg.hgSbsDiff"></a>
-<h4>Hg.hgSbsDiff</h4>
-<b>hgSbsDiff</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
-</dd>
-</dl>
 <a NAME="Hg.hgServe" ID="Hg.hgServe"></a>
 <h4>Hg.hgServe</h4>
 <b>hgServe</b>(<i>repoPath</i>)
@@ -2100,6 +2012,23 @@
 flag indicating an execution without errors (boolean)
 </dd>
 </dl>
+<a NAME="Hg.vcsForget" ID="Hg.vcsForget"></a>
+<h4>Hg.vcsForget</h4>
+<b>vcsForget</b>(<i>name</i>)
+
+<p>
+        Public method used to remove a file from the Mercurial repository.
+</p>
+<p>
+        This will not remove the file from the project directory.
+</p>
+<dl>
+
+<dt><i>name</i> (str or list of str)</dt>
+<dd>
+file/directory name to be removed
+</dd>
+</dl>
 <a NAME="Hg.vcsGetProjectBrowserHelper" ID="Hg.vcsGetProjectBrowserHelper"></a>
 <h4>Hg.vcsGetProjectBrowserHelper</h4>
 <b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser=False</i>)
@@ -2453,6 +2382,82 @@
 string with ready formated info for display (string)
 </dd>
 </dl>
+<a NAME="Hg.vcsResolved" ID="Hg.vcsResolved"></a>
+<h4>Hg.vcsResolved</h4>
+<b>vcsResolved</b>(<i>name, unresolve=False</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>
+<dt><i>unresolve</i></dt>
+<dd>
+flag indicating to mark the file/directory as
+            unresolved (boolean)
+</dd>
+</dl>
+<a NAME="Hg.vcsRevert" ID="Hg.vcsRevert"></a>
+<h4>Hg.vcsRevert</h4>
+<b>vcsRevert</b>(<i>name</i>)
+
+<p>
+        Public method used to revert changes made to a file/directory.
+</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="Hg.vcsSbsDiff" ID="Hg.vcsSbsDiff"></a>
+<h4>Hg.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 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
+</dd>
+</dl>
 <a NAME="Hg.vcsShutdown" ID="Hg.vcsShutdown"></a>
 <h4>Hg.vcsShutdown</h4>
 <b>vcsShutdown</b>(<i></i>)

Mercurial Repository: eric

eric ide

mercurial