Mercurial Repositories > eric / file diff

--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html	Fri Aug 23 13:06:04 2019 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html	Fri Aug 23 13:06:55 2019 +0200
@@ -104,6 +104,9 @@
 <td><a href="#Hg._createStatusMonitorThread">_createStatusMonitorThread</a></td>
 <td>Protected method to create an instance of the VCS status monitor thread.</td>
 </tr><tr>
+<td><a href="#Hg.canCommitMerge">canCommitMerge</a></td>
+<td>Public method to check, if the working directory is an uncommitted merge.</td>
+</tr><tr>
 <td><a href="#Hg.canPull">canPull</a></td>
 <td>Public method to check, if pull is possible.</td>
 </tr><tr>
@@ -131,6 +134,9 @@
 <td><a href="#Hg.hasSubrepositories">hasSubrepositories</a></td>
 <td>Public method to check, if the project might have sub-repositories.</td>
 </tr><tr>
+<td><a href="#Hg.hgAbortMerge">hgAbortMerge</a></td>
+<td>Public method to abort an uncommitted merge.</td>
+</tr><tr>
 <td><a href="#Hg.hgAddSubrepository">hgAddSubrepository</a></td>
 <td>Public method to add a sub-repository.</td>
 </tr><tr>
@@ -176,9 +182,6 @@
 <td><a href="#Hg.hgBundle">hgBundle</a></td>
 <td>Public method to create a changegroup file.</td>
 </tr><tr>
-<td><a href="#Hg.hgCancelMerge">hgCancelMerge</a></td>
-<td>Public method to cancel an uncommitted merge.</td>
-</tr><tr>
 <td><a href="#Hg.hgConflicts">hgConflicts</a></td>
 <td>Public method used to show a list of files containing conflicts.</td>
 </tr><tr>
@@ -574,6 +577,27 @@
 <dd>
 reference to the monitor thread (QThread)
 </dd>
+</dl><a NAME="Hg.canCommitMerge" ID="Hg.canCommitMerge"></a>
+<h4>Hg.canCommitMerge</h4>
+<b>canCommitMerge</b>(<i>name</i>)
+<p>
+        Public method to check, if the working directory is an uncommitted
+        merge.
+</p><dl>
+<dt><i>name</i> (str)</dt>
+<dd>
+file/directory name
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating commit merge capability
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="Hg.canPull" ID="Hg.canPull"></a>
 <h4>Hg.canPull</h4>
 <b>canPull</b>(<i></i>)
@@ -665,6 +689,22 @@
 <dd>
 flag indicating the existence of sub-repositories (boolean)
 </dd>
+</dl><a NAME="Hg.hgAbortMerge" ID="Hg.hgAbortMerge"></a>
+<h4>Hg.hgAbortMerge</h4>
+<b>hgAbortMerge</b>(<i>name</i>)
+<p>
+        Public method to abort an uncommitted merge.
+</p><dl>
+<dt><i>name</i></dt>
+<dd>
+file/directory name (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating, that the abortion contained an add
+            or delete (boolean)
+</dd>
 </dl><a NAME="Hg.hgAddSubrepository" ID="Hg.hgAddSubrepository"></a>
 <h4>Hg.hgAddSubrepository</h4>
 <b>hgAddSubrepository</b>(<i></i>)
@@ -848,22 +888,6 @@
 <dd>
 dictionary containing the bundle creation information
 </dd>
-</dl><a NAME="Hg.hgCancelMerge" ID="Hg.hgCancelMerge"></a>
-<h4>Hg.hgCancelMerge</h4>
-<b>hgCancelMerge</b>(<i>name</i>)
-<p>
-        Public method to cancel an uncommitted merge.
-</p><dl>
-<dt><i>name</i></dt>
-<dd>
-file/directory name (string)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-flag indicating, that the cancellation contained an add
-            or delete (boolean)
-</dd>
 </dl><a NAME="Hg.hgConflicts" ID="Hg.hgConflicts"></a>
 <h4>Hg.hgConflicts</h4>
 <b>hgConflicts</b>(<i>name</i>)
@@ -1627,7 +1651,7 @@
 </dd>
 </dl><a NAME="Hg.vcsCommit" ID="Hg.vcsCommit"></a>
 <h4>Hg.vcsCommit</h4>
-<b>vcsCommit</b>(<i>name, message, noDialog=False, closeBranch=False, mq=False</i>)
+<b>vcsCommit</b>(<i>name, message, noDialog=False, closeBranch=False, mq=False, merge=False</i>)
 <p>
         Public method used to make the change of a file/directory permanent
         in the Mercurial repository.
@@ -1648,6 +1672,9 @@
 </dd><dt><i>mq=</i></dt>
 <dd>
 flag indicating a queue commit (boolean)
+</dd><dt><i>merge=</i></dt>
+<dd>
+flag indicating a merge commit (boolean)
 </dd>
 </dl><a NAME="Hg.vcsConvertProject" ID="Hg.vcsConvertProject"></a>
 <h4>Hg.vcsConvertProject</h4>