Mercurial Repositories > eric / changeset
changeset
A little optimization for the Mercurial interface.
Tue, 23 Jul 2013 18:34:55 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 23 Jul 2013 18:34:55 +0200
- changeset 2816
- 05aab5164d64
- parent 2815
- 53c1d1f9ec86
- child 2817
- 961fba66e019
A little optimization for the Mercurial interface.
--- a/APIs/Python3/eric5.api Mon Jul 22 20:08:29 2013 +0200 +++ b/APIs/Python3/eric5.api Tue Jul 23 18:34:55 2013 +0200 @@ -4384,7 +4384,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.on_recentComboBox_activated?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.rejected?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.showEvent?4(evt) -eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, mq, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_dirButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_targetEdit_textChanged?4(txt) @@ -4558,7 +4558,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_statusList_itemChanged?4(item, column) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_statusList_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog?1(vcs, mq=False, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread._performMonitor?5() eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread._shutdown?5() eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread?1(interval, project, vcs, parent=None) @@ -4583,6 +4583,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.on_tagCombo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog?1(taglist, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getConfigPath?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.prepareProcess?4(proc, encoding="", language="") eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper._addVCSMenu?5(mainMenu) eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper._addVCSMenuBack?5(mainMenu) eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper._addVCSMenuDir?5(mainMenu) @@ -4695,6 +4696,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueGuardsList?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueGuardsListAll?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueGuardsSetActive?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueInit?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueListPatches?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueListQueues?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueNewPatch?4(name) @@ -4703,6 +4705,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueRenamePatch?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueShowHeader?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueShowPatch?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueStatus?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.shutdown?4() eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues?1(vcs) eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.getData?4() @@ -4806,7 +4809,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCheckout?4(vcsDataDict, projectDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCleanup?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommandLine?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommit?4(name, message, noDialog=False, closeBranch=False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommit?4(name, message, noDialog=False, closeBranch=False, mq=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsConvertProject?4(vcsDataDict, project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsDiff?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsExists?4()
--- a/APIs/Python3/eric5.bas Mon Jul 22 20:08:29 2013 +0200 +++ b/APIs/Python3/eric5.bas Tue Jul 23 18:34:55 2013 +0200 @@ -63,7 +63,7 @@ ChangeBookmarkCommand QUndoCommand ChatWidget QWidget Ui_ChatWidget ChromeImporter BookmarksImporter -Class ClbrBaseClasses.Class VisibilityMixin +Class ClbrBase ClassItem UMLItem ClassModel UMLModel ClassScope Scope
--- a/Documentation/Help/source.qhp Mon Jul 22 20:08:29 2013 +0200 +++ b/Documentation/Help/source.qhp Tue Jul 23 18:34:55 2013 +0200 @@ -9233,6 +9233,7 @@ <keyword name="Queues.hgQueueGuardsList" id="Queues.hgQueueGuardsList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueGuardsList" /> <keyword name="Queues.hgQueueGuardsListAll" id="Queues.hgQueueGuardsListAll" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueGuardsListAll" /> <keyword name="Queues.hgQueueGuardsSetActive" id="Queues.hgQueueGuardsSetActive" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueGuardsSetActive" /> + <keyword name="Queues.hgQueueInit" id="Queues.hgQueueInit" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueInit" /> <keyword name="Queues.hgQueueListPatches" id="Queues.hgQueueListPatches" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueListPatches" /> <keyword name="Queues.hgQueueListQueues" id="Queues.hgQueueListQueues" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueListQueues" /> <keyword name="Queues.hgQueueNewPatch" id="Queues.hgQueueNewPatch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueNewPatch" /> @@ -9241,11 +9242,13 @@ <keyword name="Queues.hgQueueRenamePatch" id="Queues.hgQueueRenamePatch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueRenamePatch" /> <keyword name="Queues.hgQueueShowHeader" id="Queues.hgQueueShowHeader" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueShowHeader" /> <keyword name="Queues.hgQueueShowPatch" id="Queues.hgQueueShowPatch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueShowPatch" /> + <keyword name="Queues.hgQueueStatus" id="Queues.hgQueueStatus" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.hgQueueStatus" /> <keyword name="Queues.shutdown" id="Queues.shutdown" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html#Queues.shutdown" /> <keyword name="QueuesExtension (Package)" id="QueuesExtension (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.html" /> <keyword name="QueuesProjectHelper" id="QueuesProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper" /> <keyword name="QueuesProjectHelper (Constructor)" id="QueuesProjectHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__init__" /> <keyword name="QueuesProjectHelper.__hgQueueActivateQueue" id="QueuesProjectHelper.__hgQueueActivateQueue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueActivateQueue" /> + <keyword name="QueuesProjectHelper.__hgQueueCommit" id="QueuesProjectHelper.__hgQueueCommit" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueCommit" /> <keyword name="QueuesProjectHelper.__hgQueueCreateQueue" id="QueuesProjectHelper.__hgQueueCreateQueue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueCreateQueue" /> <keyword name="QueuesProjectHelper.__hgQueueDeletePatch" id="QueuesProjectHelper.__hgQueueDeletePatch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueDeletePatch" /> <keyword name="QueuesProjectHelper.__hgQueueDeleteQueue" id="QueuesProjectHelper.__hgQueueDeleteQueue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueDeleteQueue" /> @@ -9260,6 +9263,7 @@ <keyword name="QueuesProjectHelper.__hgQueueGuardsList" id="QueuesProjectHelper.__hgQueueGuardsList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueGuardsList" /> <keyword name="QueuesProjectHelper.__hgQueueGuardsListAll" id="QueuesProjectHelper.__hgQueueGuardsListAll" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueGuardsListAll" /> <keyword name="QueuesProjectHelper.__hgQueueGuardsSetActive" id="QueuesProjectHelper.__hgQueueGuardsSetActive" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueGuardsSetActive" /> + <keyword name="QueuesProjectHelper.__hgQueueInit" id="QueuesProjectHelper.__hgQueueInit" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueInit" /> <keyword name="QueuesProjectHelper.__hgQueueListPatches" id="QueuesProjectHelper.__hgQueueListPatches" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueListPatches" /> <keyword name="QueuesProjectHelper.__hgQueueListQueues" id="QueuesProjectHelper.__hgQueueListQueues" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueListQueues" /> <keyword name="QueuesProjectHelper.__hgQueueNewPatch" id="QueuesProjectHelper.__hgQueueNewPatch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueNewPatch" /> @@ -9283,6 +9287,7 @@ <keyword name="QueuesProjectHelper.__hgQueueRenameQueue" id="QueuesProjectHelper.__hgQueueRenameQueue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueRenameQueue" /> <keyword name="QueuesProjectHelper.__hgQueueShowHeader" id="QueuesProjectHelper.__hgQueueShowHeader" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueShowHeader" /> <keyword name="QueuesProjectHelper.__hgQueueShowPatch" id="QueuesProjectHelper.__hgQueueShowPatch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueShowPatch" /> + <keyword name="QueuesProjectHelper.__hgQueueStatus" id="QueuesProjectHelper.__hgQueueStatus" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__hgQueueStatus" /> <keyword name="QueuesProjectHelper.__initGuardsActions" id="QueuesProjectHelper.__initGuardsActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__initGuardsActions" /> <keyword name="QueuesProjectHelper.__initPushPopActions" id="QueuesProjectHelper.__initPushPopActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__initPushPopActions" /> <keyword name="QueuesProjectHelper.__initPushPopForceActions" id="QueuesProjectHelper.__initPushPopForceActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html#QueuesProjectHelper.__initPushPopForceActions" /> @@ -12874,6 +12879,7 @@ <keyword name="pendingWrite" id="pendingWrite" ref="eric5.DebugClients.Ruby.AsyncFile.html#pendingWrite" /> <keyword name="pep8 (Module)" id="pep8 (Module)" ref="eric5.Plugins.CheckerPlugins.Pep8.pep8.html" /> <keyword name="pep8 (Module)" id="pep8 (Module)" ref="eric5.UtilitiesPython2.pep8.html" /> + <keyword name="prepareProcess" id="prepareProcess" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html#prepareProcess" /> <keyword name="prepareQtMacBundle" id="prepareQtMacBundle" ref="eric5.Utilities.__init__.html#prepareQtMacBundle" /> <keyword name="prepareUninstall" id="prepareUninstall" ref="eric5.Plugins.PluginVcsMercurial.html#prepareUninstall" /> <keyword name="prepareUninstall" id="prepareUninstall" ref="eric5.Plugins.PluginVcsPySvn.html#prepareUninstall" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html Mon Jul 22 20:08:29 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html Tue Jul 23 18:34:55 2013 +0200 @@ -100,13 +100,16 @@ </table> <a NAME="HgCommitDialog.__init__" ID="HgCommitDialog.__init__"></a> <h4>HgCommitDialog (Constructor)</h4> -<b>HgCommitDialog</b>(<i>vcs, parent=None</i>) +<b>HgCommitDialog</b>(<i>vcs, mq, parent=None</i>) <p> Constructor </p><dl> <dt><i>vcs</i></dt> <dd> reference to the vcs object +</dd><dt><i>mq</i></dt> +<dd> +flag indicating a queue commit (boolean) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Mon Jul 22 20:08:29 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Tue Jul 23 18:34:55 2013 +0200 @@ -196,13 +196,16 @@ </table> <a NAME="HgStatusDialog.__init__" ID="HgStatusDialog.__init__"></a> <h4>HgStatusDialog (Constructor)</h4> -<b>HgStatusDialog</b>(<i>vcs, parent=None</i>) +<b>HgStatusDialog</b>(<i>vcs, mq=False, parent=None</i>) <p> Constructor </p><dl> <dt><i>vcs</i></dt> <dd> reference to the vcs object +</dd><dt><i>mq</i></dt> +<dd> +flag indicating to show a queue repo status (boolean) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html Mon Jul 22 20:08:29 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html Tue Jul 23 18:34:55 2013 +0200 @@ -36,6 +36,9 @@ <tr> <td><a href="#getConfigPath">getConfigPath</a></td> <td>Public method to get the filename of the config file.</td> +</tr><tr> +<td><a href="#prepareProcess">prepareProcess</a></td> +<td>Public method to prepare the given process.</td> </tr> </table> <hr /><hr /> @@ -51,5 +54,24 @@ </dd> </dl> <div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="prepareProcess" ID="prepareProcess"></a> +<h2>prepareProcess</h2> +<b>prepareProcess</b>(<i>proc, encoding="", language=""</i>) +<p> + Public method to prepare the given process. +</p><dl> +<dt><i>proc</i></dt> +<dd> +reference to the proces to be prepared (QProcess) +</dd><dt><i>encoding</i></dt> +<dd> +encoding to be used by the process (string) +</dd><dt><i>language</i></dt> +<dd> +language to be set (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html Mon Jul 22 20:08:29 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html Tue Jul 23 18:34:55 2013 +0200 @@ -63,6 +63,9 @@ <td><a href="#QueuesProjectHelper.__hgQueueActivateQueue">__hgQueueActivateQueue</a></td> <td>Private slot used to set the active queue.</td> </tr><tr> +<td><a href="#QueuesProjectHelper.__hgQueueCommit">__hgQueueCommit</a></td> +<td>Private slot to commit changes in the queue repository.</td> +</tr><tr> <td><a href="#QueuesProjectHelper.__hgQueueCreateQueue">__hgQueueCreateQueue</a></td> <td>Private slot used to create a new queue.</td> </tr><tr> @@ -105,6 +108,9 @@ <td><a href="#QueuesProjectHelper.__hgQueueGuardsSetActive">__hgQueueGuardsSetActive</a></td> <td>Private slot used to set the active guards.</td> </tr><tr> +<td><a href="#QueuesProjectHelper.__hgQueueInit">__hgQueueInit</a></td> +<td>Private slot to initialize a new queue repository.</td> +</tr><tr> <td><a href="#QueuesProjectHelper.__hgQueueListPatches">__hgQueueListPatches</a></td> <td>Private slot used to show a list of applied and unapplied patches.</td> </tr><tr> @@ -174,6 +180,9 @@ <td><a href="#QueuesProjectHelper.__hgQueueShowPatch">__hgQueueShowPatch</a></td> <td>Private slot used to show the contents of the current patch.</td> </tr><tr> +<td><a href="#QueuesProjectHelper.__hgQueueStatus">__hgQueueStatus</a></td> +<td>Private slot to show the status of the queue repository.</td> +</tr><tr> <td><a href="#QueuesProjectHelper.__initGuardsActions">__initGuardsActions</a></td> <td>Public method to generate the guards action objects.</td> </tr><tr> @@ -210,6 +219,11 @@ <b>__hgQueueActivateQueue</b>(<i></i>) <p> Private slot used to set the active queue. +</p><a NAME="QueuesProjectHelper.__hgQueueCommit" ID="QueuesProjectHelper.__hgQueueCommit"></a> +<h4>QueuesProjectHelper.__hgQueueCommit</h4> +<b>__hgQueueCommit</b>(<i></i>) +<p> + Private slot to commit changes in the queue repository. </p><a NAME="QueuesProjectHelper.__hgQueueCreateQueue" ID="QueuesProjectHelper.__hgQueueCreateQueue"></a> <h4>QueuesProjectHelper.__hgQueueCreateQueue</h4> <b>__hgQueueCreateQueue</b>(<i></i>) @@ -282,6 +296,11 @@ <b>__hgQueueGuardsSetActive</b>(<i></i>) <p> Private slot used to set the active guards. +</p><a NAME="QueuesProjectHelper.__hgQueueInit" ID="QueuesProjectHelper.__hgQueueInit"></a> +<h4>QueuesProjectHelper.__hgQueueInit</h4> +<b>__hgQueueInit</b>(<i></i>) +<p> + Private slot to initialize a new queue repository. </p><a NAME="QueuesProjectHelper.__hgQueueListPatches" ID="QueuesProjectHelper.__hgQueueListPatches"></a> <h4>QueuesProjectHelper.__hgQueueListPatches</h4> <b>__hgQueueListPatches</b>(<i></i>) @@ -430,6 +449,11 @@ <b>__hgQueueShowPatch</b>(<i></i>) <p> Private slot used to show the contents of the current patch. +</p><a NAME="QueuesProjectHelper.__hgQueueStatus" ID="QueuesProjectHelper.__hgQueueStatus"></a> +<h4>QueuesProjectHelper.__hgQueueStatus</h4> +<b>__hgQueueStatus</b>(<i></i>) +<p> + Private slot to show the status of the queue repository. </p><a NAME="QueuesProjectHelper.__initGuardsActions" ID="QueuesProjectHelper.__initGuardsActions"></a> <h4>QueuesProjectHelper.__initGuardsActions</h4> <b>__initGuardsActions</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html Mon Jul 22 20:08:29 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html Tue Jul 23 18:34:55 2013 +0200 @@ -108,6 +108,9 @@ <td><a href="#Queues.hgQueueGuardsSetActive">hgQueueGuardsSetActive</a></td> <td>Public method to set the active guards.</td> </tr><tr> +<td><a href="#Queues.hgQueueInit">hgQueueInit</a></td> +<td>Public method to initialize a new queue repository.</td> +</tr><tr> <td><a href="#Queues.hgQueueListPatches">hgQueueListPatches</a></td> <td>Public method to show a list of all patches.</td> </tr><tr> @@ -132,6 +135,9 @@ <td><a href="#Queues.hgQueueShowPatch">hgQueueShowPatch</a></td> <td>Public method to show the contents of the current patch.</td> </tr><tr> +<td><a href="#Queues.hgQueueStatus">hgQueueStatus</a></td> +<td>Public method used to view the status of a queue repository.</td> +</tr><tr> <td><a href="#Queues.shutdown">shutdown</a></td> <td>Public method used to shutdown the queues interface.</td> </tr> @@ -348,6 +354,16 @@ <dd> file/directory name (string) </dd> +</dl><a NAME="Queues.hgQueueInit" ID="Queues.hgQueueInit"></a> +<h4>Queues.hgQueueInit</h4> +<b>hgQueueInit</b>(<i>name</i>) +<p> + Public method to initialize a new queue repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name (string) +</dd> </dl><a NAME="Queues.hgQueueListPatches" ID="Queues.hgQueueListPatches"></a> <h4>Queues.hgQueueListPatches</h4> <b>hgQueueListPatches</b>(<i>name</i>) @@ -451,6 +467,16 @@ <dd> file/directory name (string) </dd> +</dl><a NAME="Queues.hgQueueStatus" ID="Queues.hgQueueStatus"></a> +<h4>Queues.hgQueueStatus</h4> +<b>hgQueueStatus</b>(<i>name</i>) +<p> + Public method used to view the status of a queue repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name (string) +</dd> </dl><a NAME="Queues.shutdown" ID="Queues.shutdown"></a> <h4>Queues.shutdown</h4> <b>shutdown</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon Jul 22 20:08:29 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Tue Jul 23 18:34:55 2013 +0200 @@ -1111,7 +1111,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</i>) +<b>vcsCommit</b>(<i>name, message, noDialog=False, closeBranch=False, mq=False</i>) <p> Public method used to make the change of a file/directory permanent in the Mercurial repository. @@ -1128,6 +1128,9 @@ </dd><dt><i>closeBranch=</i></dt> <dd> flag indicating a close branch commit (boolean) +</dd><dt><i>mq=</i></dt> +<dd> +flag indicating a queue commit (boolean) </dd> </dl><a NAME="Hg.vcsConvertProject" ID="Hg.vcsConvertProject"></a> <h4>Hg.vcsConvertProject</h4>
--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py Mon Jul 22 20:08:29 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py Tue Jul 23 18:34:55 2013 +0200 @@ -10,10 +10,11 @@ import struct import io -from PyQt4.QtCore import QProcess, QProcessEnvironment, QObject, QByteArray, \ - QCoreApplication, QThread +from PyQt4.QtCore import QProcess, QObject, QByteArray, QCoreApplication, QThread from PyQt4.QtGui import QDialog +from .HgUtilities import prepareProcess + import Preferences @@ -73,11 +74,7 @@ # connect signals self.__server.finished.connect(self.__serverFinished) - # set the encoding for the server - if self.__encoding: - env = QProcessEnvironment.systemEnvironment() - env.insert("HGENCODING", self.__encoding) - self.__server.setProcessEnvironment(env) + prepareProcess(self.__server, self.__encoding) self.__server.start('hg', self.__serverArgs) serverStarted = self.__server.waitForStarted(5000)
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Mon Jul 22 20:08:29 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Tue Jul 23 18:34:55 2013 +0200 @@ -10,11 +10,13 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, QProcessEnvironment, QTimer +from PyQt4.QtCore import pyqtSlot, QProcess, QTimer from PyQt4.QtGui import QDialog, QDialogButtonBox from E5Gui import E5MessageBox +from .HgUtilities import prepareProcess + from .Ui_HgSummaryDialog import Ui_HgSummaryDialog import Preferences @@ -87,9 +89,7 @@ self.process.kill() else: self.process = QProcess() - env = QProcessEnvironment.systemEnvironment() - env.insert("LANGUAGE", "C") - self.process.setProcessEnvironment(env) + prepareProcess(self.process, Preferences.getSystem("IOEncoding"), "C") self.process.finished.connect(self.__procFinished) self.process.readyReadStandardOutput.connect(self.__readStdout) self.process.readyReadStandardError.connect(self.__readStderr)
--- a/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Mon Jul 22 20:08:29 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Tue Jul 23 18:34:55 2013 +0200 @@ -9,6 +9,8 @@ import os +from PyQt4.QtCore import QProcessEnvironment + import Utilities @@ -24,3 +26,25 @@ else: homedir = Utilities.getHomeDir() return os.path.join(homedir, ".hgrc") + + +def prepareProcess(proc, encoding="", language=""): + """ + Public method to prepare the given process. + + @param proc reference to the proces to be prepared (QProcess) + @param encoding encoding to be used by the process (string) + @param language language to be set (string) + """ + env = QProcessEnvironment.systemEnvironment() + env.insert("HGPLAIN", '1') + + # set the encoding for the process + if encoding: + env.insert("HGENCODING", encoding) + + # set the language for the process + if language: + env.insert("LANGUAGE", language) + + proc.setProcessEnvironment(env)
