Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py

branch
Py2 comp.
changeset 3484
645c12de6b0c
parent 3178
f25fc1364c88
parent 3407
07966c6b5565
child 3656
441956d8fce5
diff -r 96232974dcdb -r 645c12de6b0c Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Sun Mar 30 22:00:14 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Thu Apr 03 23:05:31 2014 +0200
@@ -46,6 +46,9 @@
             self.bookmark1Combo.setHidden(True)
             self.bookmark2Button.setHidden(True)
             self.bookmark2Combo.setHidden(True)
+        
+        msh = self.minimumSizeHint()
+        self.resize(max(self.width(), msh.width()), msh.height())
     
     def __updateOK(self):
         """
@@ -236,6 +239,7 @@
             bookmarkCombo = self.bookmark1Combo
             tipButton = self.tip1Button
             prevButton = self.prev1Button
+            noneButton = self.none1Button
         else:
             numberButton = self.number2Button
             numberSpinBox = self.number2SpinBox
@@ -249,11 +253,12 @@
             bookmarkCombo = self.bookmark2Combo
             tipButton = self.tip2Button
             prevButton = self.prev2Button
+            noneButton = self.none2Button
         
         if numberButton.isChecked():
-            return str(numberSpinBox.value())
+            return "rev({0})".format(numberSpinBox.value())
         elif idButton.isChecked():
-            return idEdit.text()
+            return "id({0})".format(idEdit.text())
         elif tagButton.isChecked():
             return tagCombo.currentText()
         elif branchButton.isChecked():
@@ -264,6 +269,8 @@
             return "tip"
         elif prevButton.isChecked():
             return "."
+        elif noneButton.isChecked():
+            return ""
     
     def getRevisions(self):
         """

eric ide

mercurial