Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Sat Feb 04 20:31:35 2017 +0100
+++ b/APIs/Python3/eric6.api	Sun Feb 05 11:37:23 2017 +0100
@@ -4935,7 +4935,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked?4(checked)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked?4(checked)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog?1(withLargefiles=False, largefilesData=None, parent=None)
-eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.getRevision?4()
+eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.getRevision?4(revset=True)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_branchButton_toggled?4(checked)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html	Sat Feb 04 20:31:35 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html	Sun Feb 05 11:37:23 2017 +0100
@@ -124,13 +124,24 @@
         Private slot to update the OK button.
 </p><a NAME="HgRevisionSelectionDialog.getRevision" ID="HgRevisionSelectionDialog.getRevision"></a>
 <h4>HgRevisionSelectionDialog.getRevision</h4>
-<b>getRevision</b>(<i></i>)
+<b>getRevision</b>(<i>revset=True</i>)
 <p>
         Public method to retrieve the selected revision.
 </p><dl>
+<dt><i>revset</i> (bool)</dt>
+<dd>
+flag indicating to get the revision or ID as a
+            revset
+</dd>
+</dl><dl>
 <dt>Returns:</dt>
 <dd>
-selected revision (string)
+selected revision
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl><a NAME="HgRevisionSelectionDialog.on_bookmarkButton_toggled" ID="HgRevisionSelectionDialog.on_bookmarkButton_toggled"></a>
 <h4>HgRevisionSelectionDialog.on_bookmarkButton_toggled</h4>

--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Sat Feb 04 20:31:35 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Sun Feb 05 11:37:23 2017 +0100
@@ -70,7 +70,7 @@
                 self.vcs.hgGetBranchesList(repodir),
                 self.vcs.hgGetBookmarksList(repodir))
             if dlg.exec_() == QDialog.Accepted:
-                rev = dlg.getRevision()
+                rev = dlg.getRevision(revset=False)
         
         if rev is not None:
             if rev == "":

--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py	Sat Feb 04 20:31:35 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py	Sun Feb 05 11:37:23 2017 +0100
@@ -137,16 +137,27 @@
         """
         self.__updateOK()
     
-    def getRevision(self):
+    def getRevision(self, revset=True):
         """
         Public method to retrieve the selected revision.
         
-        @return selected revision (string)
+        @param revset flag indicating to get the revision or ID as a
+            revset
+        @type bool
+        @return selected revision
+        @rtype str
         """
         if self.numberButton.isChecked():
-            rev = "rev({0})".format(self.numberSpinBox.value())
+            if revset:
+                rev = "rev({0})".format(self.numberSpinBox.value())
+            else:
+                rev = str(self.numberSpinBox.value())
         elif self.idButton.isChecked():
             rev = "id({0})".format(self.idEdit.text())
+            if revset:
+                rev = "id({0})".format(self.idEdit.text())
+            else:
+                rev = self.idEdit.text()
         elif self.tagButton.isChecked():
             rev = self.tagCombo.currentText()
         elif self.branchButton.isChecked():