Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Thu Apr 06 18:33:40 2017 +0200
+++ b/APIs/Python3/eric6.api	Thu Apr 06 18:37:10 2017 +0200
@@ -181,6 +181,7 @@
 eric6.DebugClients.Python.DebugBase.DebugBase.lib?7
 eric6.DebugClients.Python.DebugBase.DebugBase.move_instruction_pointer?4(lineno)
 eric6.DebugClients.Python.DebugBase.DebugBase.pathsToSkip?7
+eric6.DebugClients.Python.DebugBase.DebugBase.pollTimerEnabled?7
 eric6.DebugClients.Python.DebugBase.DebugBase.profile?4(frame, event, arg)
 eric6.DebugClients.Python.DebugBase.DebugBase.profileWithRecursion?4(frame, event, arg)
 eric6.DebugClients.Python.DebugBase.DebugBase.run?4(cmd, globalsDict=None, localsDict=None, debug=True)
@@ -4783,7 +4784,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_multipleEdit_textChanged?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_tagButton_toggled?4(checked)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_tagCombo_editTextChanged?4(txt)
-eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, bookmarksList=None, parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, bookmarksList=None, version=(0, 0, 0), parent=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.Channels?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.InputFormat?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.OutputFormat?7

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Thu Apr 06 18:33:40 2017 +0200
+++ b/Documentation/Help/source.qhp	Thu Apr 06 18:37:10 2017 +0200
@@ -9489,7 +9489,6 @@
       <keyword name="LfRevisionsInputDialog.on_revisionsEdit_textChanged" id="LfRevisionsInputDialog.on_revisionsEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfRevisionsInputDialog.html#LfRevisionsInputDialog.on_revisionsEdit_textChanged" />
       <keyword name="LineComplexityVisitor" id="LineComplexityVisitor" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor" />
       <keyword name="LineComplexityVisitor (Constructor)" id="LineComplexityVisitor (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor.__init__" />
-      <keyword name="LineComplexityVisitor.__median" id="LineComplexityVisitor.__median" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor.__median" />
       <keyword name="LineComplexityVisitor.score" id="LineComplexityVisitor.score" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor.score" />
       <keyword name="LineComplexityVisitor.sortedList" id="LineComplexityVisitor.sortedList" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor.sortedList" />
       <keyword name="LineComplexityVisitor.visit" id="LineComplexityVisitor.visit" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor.visit" />

--- a/Documentation/Source/eric6.DebugClients.Python.DebugBase.html	Thu Apr 06 18:33:40 2017 +0200
+++ b/Documentation/Source/eric6.DebugClients.Python.DebugBase.html	Thu Apr 06 18:37:10 2017 +0200
@@ -56,7 +56,7 @@
 object
 <h3>Class Attributes</h3>
 <table>
-<tr><td>_fnCache</td></tr><tr><td>filesToSkip</td></tr><tr><td>lib</td></tr><tr><td>pathsToSkip</td></tr>
+<tr><td>_fnCache</td></tr><tr><td>filesToSkip</td></tr><tr><td>lib</td></tr><tr><td>pathsToSkip</td></tr><tr><td>pollTimerEnabled</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>

--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html	Thu Apr 06 18:33:40 2017 +0200
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html	Thu Apr 06 18:37:10 2017 +0200
@@ -196,9 +196,6 @@
 <td><a href="#LineComplexityVisitor.__init__">LineComplexityVisitor</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#LineComplexityVisitor.__median">__median</a></td>
-<td>Private method to determine the median of a list.</td>
-</tr><tr>
 <td><a href="#LineComplexityVisitor.score">score</a></td>
 <td>Public method to calculate the median.</td>
 </tr><tr>
@@ -218,27 +215,7 @@
 <b>LineComplexityVisitor</b>(<i></i>)
 <p>
         Constructor
-</p><a NAME="LineComplexityVisitor.__median" ID="LineComplexityVisitor.__median"></a>
-<h4>LineComplexityVisitor.__median</h4>
-<b>__median</b>(<i>lst</i>)
-<p>
-        Private method to determine the median of a list.
-</p><dl>
-<dt><i>lst</i> (list of int)</dt>
-<dd>
-list to determine the median for
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-median of the list
-</dd>
-</dl><dl>
-<dt>Return Type:</dt>
-<dd>
-float
-</dd>
-</dl><a NAME="LineComplexityVisitor.score" ID="LineComplexityVisitor.score"></a>
+</p><a NAME="LineComplexityVisitor.score" ID="LineComplexityVisitor.score"></a>
 <h4>LineComplexityVisitor.score</h4>
 <b>score</b>(<i></i>)
 <p>

--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html	Thu Apr 06 18:33:40 2017 +0200
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html	Thu Apr 06 18:37:10 2017 +0200
@@ -97,22 +97,25 @@
 </table>
 <a NAME="HgBundleDialog.__init__" ID="HgBundleDialog.__init__"></a>
 <h4>HgBundleDialog (Constructor)</h4>
-<b>HgBundleDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>)
+<b>HgBundleDialog</b>(<i>tagsList, branchesList, bookmarksList=None, version=(0, 0, 0), parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>tagsList</i></dt>
+<dt><i>tagsList</i> (list of str)</dt>
 <dd>
-list of tags (list of strings)
-</dd><dt><i>branchesList</i></dt>
+list of tags
+</dd><dt><i>branchesList</i> (list of str)</dt>
+<dd>
+list of branches
+</dd><dt><i>bookmarksList</i> (list of str)</dt>
 <dd>
-list of branches (list of strings)
-</dd><dt><i>bookmarksList</i></dt>
+list of bookmarks
+</dd><dt><i>version</i> (tuple of three integers)</dt>
 <dd>
-list of bookmarks (list of strings)
-</dd><dt><i>parent</i></dt>
+Mercurial version info
+</dd><dt><i>parent</i> (QWidget)</dt>
 <dd>
-parent widget (QWidget)
+parent widget
 </dd>
 </dl><a NAME="HgBundleDialog.__updateOK" ID="HgBundleDialog.__updateOK"></a>
 <h4>HgBundleDialog.__updateOK</h4>

--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Thu Apr 06 18:33:40 2017 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Thu Apr 06 18:37:10 2017 +0200
@@ -20,21 +20,32 @@
     Class implementing a dialog to enter the data for a bundle operation.
     """
     def __init__(self, tagsList, branchesList, bookmarksList=None,
-                 parent=None):
+                 version=(0, 0, 0), parent=None):
         """
         Constructor
         
-        @param tagsList list of tags (list of strings)
-        @param branchesList list of branches (list of strings)
-        @param bookmarksList list of bookmarks (list of strings)
-        @param parent parent widget (QWidget)
+        @param tagsList list of tags
+        @type list of str
+        @param branchesList list of branches
+        @type list of str
+        @param bookmarksList list of bookmarks
+        @type list of str
+        @param version Mercurial version info
+        @type tuple of three integers
+        @param parent parent widget
+        @type QWidget
         """
         super(HgBundleDialog, self).__init__(parent)
         self.setupUi(self)
         
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
         
-        self.compressionCombo.addItems(["", "bzip2", "gzip", "none"])
+        self.__version = version
+        
+        bundleTypes = ["", "bzip2", "gzip", "none"]
+        if version >= (4, 1, 0):
+            bundleTypes.insert(-1, "zstd")
+        self.compressionCombo.addItems(bundleTypes)
         self.tagCombo.addItems(sorted(tagsList))
         self.branchCombo.addItems(["default"] + sorted(branchesList))
         if bookmarksList is not None:
@@ -154,5 +165,8 @@
                     self.baseRevisionsEdit.toPlainText().strip().splitlines()
                     if rev.strip()]
         
-        return (revs, baseRevs, self.compressionCombo.currentText(),
-                self.allCheckBox.isChecked())
+        bundleType = self.compressionCombo.currentText()
+        if bundleType == "zstd":
+            bundleType += "-v2"
+        
+        return (revs, baseRevs, bundleType, self.allCheckBox.isChecked())

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Thu Apr 06 18:33:40 2017 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Thu Apr 06 18:37:10 2017 +0200
@@ -2513,7 +2513,8 @@
             from .HgBundleDialog import HgBundleDialog
             dlg = HgBundleDialog(self.hgGetTagsList(repodir),
                                  self.hgGetBranchesList(repodir),
-                                 self.hgGetBookmarksList(repodir))
+                                 self.hgGetBookmarksList(repodir),
+                                 version=self.version)
             if dlg.exec_() != QDialog.Accepted:
                 return
             

--- a/changelog	Thu Apr 06 18:33:40 2017 +0200
+++ b/changelog	Thu Apr 06 18:37:10 2017 +0200
@@ -20,6 +20,7 @@
   -- avoid crashes on using greenlets
 - Mercurial Interface
   -- extended the user configuration dialog
+  -- added support for the 'zstd' compression for bundles (as of 4.1.0)
 
 Version 17.03.1:
 - bug fixes