Mercurial Repositories > eric / changeset

--- a/eric6/APIs/Python3/eric6.api	Fri Aug 23 13:06:04 2019 +0200
+++ b/eric6/APIs/Python3/eric6.api	Fri Aug 23 13:06:55 2019 +0200
@@ -6078,7 +6078,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.on_recentComboBox_activated?4(txt)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.rejected?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.showEvent?4(evt)
-eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, msg, mq, parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, msg, mq, merge, parent=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.FilenameRole?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.StatusRole?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.closeEvent?4(e)
@@ -6593,6 +6593,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.IgnoreFileName?7
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg._createStatusMonitorThread?5(interval, project)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.activeExtensionsChanged?7
+eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.canCommitMerge?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.canPull?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.canPush?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.clearStatusCache?4()
@@ -6603,6 +6604,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getHgSubPath?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getPlugin?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hasSubrepositories?4()
+eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgAbortMerge?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgAddSubrepository?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgAnnotate?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgArchive?4()
@@ -6618,7 +6620,6 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkRename?4(name, renameInfo=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBranch?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBundle?4(name, bundleData=None)
-eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCancelMerge?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgConflicts?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCopy?4(name, project)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCreateIgnoreFile?4(name, autoAdd=False)
@@ -6672,7 +6673,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCheckout?4(vcsDataDict, projectDir, noDialog=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCleanup?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommandLine?4(name)
-eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommit?4(name, message, noDialog=False, closeBranch=False, mq=False)
+eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommit?4(name, message, noDialog=False, closeBranch=False, mq=False, merge=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsConvertProject?4(vcsDataDict, project)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsDiff?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsExists?4()

Binary file eric6/Documentation/Help/source.qch has changed

--- a/eric6/Documentation/Help/source.qhp	Fri Aug 23 13:06:04 2019 +0200
+++ b/eric6/Documentation/Help/source.qhp	Fri Aug 23 13:06:55 2019 +0200
@@ -8704,6 +8704,7 @@
       <keyword name="Hg.__monitorRepoIniFile" id="Hg.__monitorRepoIniFile" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__monitorRepoIniFile" />
       <keyword name="Hg.__vcsCommit_Step2" id="Hg.__vcsCommit_Step2" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__vcsCommit_Step2" />
       <keyword name="Hg._createStatusMonitorThread" id="Hg._createStatusMonitorThread" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg._createStatusMonitorThread" />
+      <keyword name="Hg.canCommitMerge" id="Hg.canCommitMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.canCommitMerge" />
       <keyword name="Hg.canPull" id="Hg.canPull" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.canPull" />
       <keyword name="Hg.canPush" id="Hg.canPush" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.canPush" />
       <keyword name="Hg.clearStatusCache" id="Hg.clearStatusCache" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.clearStatusCache" />
@@ -8713,6 +8714,7 @@
       <keyword name="Hg.getHgSubPath" id="Hg.getHgSubPath" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getHgSubPath" />
       <keyword name="Hg.getPlugin" id="Hg.getPlugin" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getPlugin" />
       <keyword name="Hg.hasSubrepositories" id="Hg.hasSubrepositories" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hasSubrepositories" />
+      <keyword name="Hg.hgAbortMerge" id="Hg.hgAbortMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgAbortMerge" />
       <keyword name="Hg.hgAddSubrepository" id="Hg.hgAddSubrepository" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgAddSubrepository" />
       <keyword name="Hg.hgAnnotate" id="Hg.hgAnnotate" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgAnnotate" />
       <keyword name="Hg.hgArchive" id="Hg.hgArchive" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgArchive" />
@@ -8728,7 +8730,6 @@
       <keyword name="Hg.hgBookmarkRename" id="Hg.hgBookmarkRename" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkRename" />
       <keyword name="Hg.hgBranch" id="Hg.hgBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBranch" />
       <keyword name="Hg.hgBundle" id="Hg.hgBundle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBundle" />
-      <keyword name="Hg.hgCancelMerge" id="Hg.hgCancelMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCancelMerge" />
       <keyword name="Hg.hgConflicts" id="Hg.hgConflicts" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgConflicts" />
       <keyword name="Hg.hgCopy" id="Hg.hgCopy" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCopy" />
       <keyword name="Hg.hgCreateIgnoreFile" id="Hg.hgCreateIgnoreFile" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCreateIgnoreFile" />
@@ -9341,6 +9342,7 @@
       <keyword name="HgProjectHelper" id="HgProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper" />
       <keyword name="HgProjectHelper (Constructor)" id="HgProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__init__" />
       <keyword name="HgProjectHelper.__checkActions" id="HgProjectHelper.__checkActions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__checkActions" />
+      <keyword name="HgProjectHelper.__hgAbortMerge" id="HgProjectHelper.__hgAbortMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgAbortMerge" />
       <keyword name="HgProjectHelper.__hgAddSubrepository" id="HgProjectHelper.__hgAddSubrepository" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgAddSubrepository" />
       <keyword name="HgProjectHelper.__hgArchive" id="HgProjectHelper.__hgArchive" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgArchive" />
       <keyword name="HgProjectHelper.__hgBackout" id="HgProjectHelper.__hgBackout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBackout" />
@@ -9362,8 +9364,8 @@
       <keyword name="HgProjectHelper.__hgBranch" id="HgProjectHelper.__hgBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBranch" />
       <keyword name="HgProjectHelper.__hgBranchList" id="HgProjectHelper.__hgBranchList" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBranchList" />
       <keyword name="HgProjectHelper.__hgBundle" id="HgProjectHelper.__hgBundle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBundle" />
-      <keyword name="HgProjectHelper.__hgCancelMerge" id="HgProjectHelper.__hgCancelMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCancelMerge" />
       <keyword name="HgProjectHelper.__hgCloseBranch" id="HgProjectHelper.__hgCloseBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCloseBranch" />
+      <keyword name="HgProjectHelper.__hgCommitMerge" id="HgProjectHelper.__hgCommitMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCommitMerge" />
       <keyword name="HgProjectHelper.__hgConfigure" id="HgProjectHelper.__hgConfigure" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgConfigure" />
       <keyword name="HgProjectHelper.__hgCreateIgnore" id="HgProjectHelper.__hgCreateIgnore" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCreateIgnore" />
       <keyword name="HgProjectHelper.__hgDeleteBackups" id="HgProjectHelper.__hgDeleteBackups" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgDeleteBackups" />

--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html	Fri Aug 23 13:06:04 2019 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html	Fri Aug 23 13:06:55 2019 +0200
@@ -94,7 +94,7 @@
 </table>
 <a NAME="HgCommitDialog.__init__" ID="HgCommitDialog.__init__"></a>
 <h4>HgCommitDialog (Constructor)</h4>
-<b>HgCommitDialog</b>(<i>vcs, msg, mq, parent=None</i>)
+<b>HgCommitDialog</b>(<i>vcs, msg, mq, merge, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -107,6 +107,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><dt><i>parent</i></dt>
 <dd>
 parent widget (QWidget)

--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html	Fri Aug 23 13:06:04 2019 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html	Fri Aug 23 13:06:55 2019 +0200
@@ -63,6 +63,9 @@
 <td><a href="#HgProjectHelper.__checkActions">__checkActions</a></td>
 <td>Private slot to set the enabled status of actions.</td>
 </tr><tr>
+<td><a href="#HgProjectHelper.__hgAbortMerge">__hgAbortMerge</a></td>
+<td>Private slot used to abort an uncommitted merge.</td>
+</tr><tr>
 <td><a href="#HgProjectHelper.__hgAddSubrepository">__hgAddSubrepository</a></td>
 <td>Private slot used to add a sub-repository.</td>
 </tr><tr>
@@ -126,12 +129,12 @@
 <td><a href="#HgProjectHelper.__hgBundle">__hgBundle</a></td>
 <td>Private slot used to create a changegroup file.</td>
 </tr><tr>
-<td><a href="#HgProjectHelper.__hgCancelMerge">__hgCancelMerge</a></td>
-<td>Private slot used to cancel an uncommitted merge.</td>
-</tr><tr>
 <td><a href="#HgProjectHelper.__hgCloseBranch">__hgCloseBranch</a></td>
 <td>Private slot used to close the current branch of the local project.</td>
 </tr><tr>
+<td><a href="#HgProjectHelper.__hgCommitMerge">__hgCommitMerge</a></td>
+<td>Private slot used to commit a merge.</td>
+</tr><tr>
 <td><a href="#HgProjectHelper.__hgConfigure">__hgConfigure</a></td>
 <td>Private method to open the configuration dialog.</td>
 </tr><tr>
@@ -311,6 +314,11 @@
 <b>__checkActions</b>(<i></i>)
 <p>
         Private slot to set the enabled status of actions.
+</p><a NAME="HgProjectHelper.__hgAbortMerge" ID="HgProjectHelper.__hgAbortMerge"></a>
+<h4>HgProjectHelper.__hgAbortMerge</h4>
+<b>__hgAbortMerge</b>(<i></i>)
+<p>
+        Private slot used to abort an uncommitted merge.
 </p><a NAME="HgProjectHelper.__hgAddSubrepository" ID="HgProjectHelper.__hgAddSubrepository"></a>
 <h4>HgProjectHelper.__hgAddSubrepository</h4>
 <b>__hgAddSubrepository</b>(<i></i>)
@@ -417,16 +425,16 @@
 <b>__hgBundle</b>(<i></i>)
 <p>
         Private slot used to create a changegroup file.
-</p><a NAME="HgProjectHelper.__hgCancelMerge" ID="HgProjectHelper.__hgCancelMerge"></a>
-<h4>HgProjectHelper.__hgCancelMerge</h4>
-<b>__hgCancelMerge</b>(<i></i>)
-<p>
-        Private slot used to cancel an uncommitted merge.
 </p><a NAME="HgProjectHelper.__hgCloseBranch" ID="HgProjectHelper.__hgCloseBranch"></a>
 <h4>HgProjectHelper.__hgCloseBranch</h4>
 <b>__hgCloseBranch</b>(<i></i>)
 <p>
         Private slot used to close the current branch of the local project.
+</p><a NAME="HgProjectHelper.__hgCommitMerge" ID="HgProjectHelper.__hgCommitMerge"></a>
+<h4>HgProjectHelper.__hgCommitMerge</h4>
+<b>__hgCommitMerge</b>(<i></i>)
+<p>
+        Private slot used to commit a merge.
 </p><a NAME="HgProjectHelper.__hgConfigure" ID="HgProjectHelper.__hgConfigure"></a>
 <h4>HgProjectHelper.__hgConfigure</h4>
 <b>__hgConfigure</b>(<i></i>)

--- 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>