Mercurial Repositories > eric / file diff

diff -r 748e4c50523b -r 7758f0c7d9f6 Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py	Mon Oct 24 19:55:05 2016 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py	Tue Oct 25 19:33:11 2016 +0200
@@ -19,15 +19,21 @@
     """
     Class documentation goes here.
     """
-    def __init__(self, tagsList, branchesList, bookmarksList=None,
+    def __init__(self, tagsList, branchesList, bookmarksList=None, rev="",
                  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 reference to the 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
+        @keyparam rev revision to strip from
+        @type str
+        @param parent reference to the parent widget
+        @type QWidget
         """
         super(HgStripDialog, self).__init__(parent)
         self.setupUi(self)
@@ -36,6 +42,7 @@
         self.branchCombo.addItems(["default"] + sorted(branchesList))
         if bookmarksList is not None:
             self.bookmarkCombo.addItems([""] + sorted(bookmarksList))
+        self.idEdit.setText(rev)
         
         msh = self.minimumSizeHint()
         self.resize(max(self.width(), msh.width()), msh.height())
@@ -65,7 +72,8 @@
         """
         Private slot to handle changes of the Number select button.
         
-        @param checked state of the button (boolean)
+        @param checked state of the button
+        @type bool
         """
         self.__updateOK()
     
@@ -74,7 +82,8 @@
         """
         Private slot to handle changes of the ID select button.
         
-        @param checked state of the button (boolean)
+        @param checked state of the button
+        @type bool
         """
         self.__updateOK()
     
@@ -83,7 +92,8 @@
         """
         Private slot to handle changes of the Tag select button.
         
-        @param checked state of the button (boolean)
+        @param checked state of the button
+        @type bool
         """
         self.__updateOK()
     
@@ -92,7 +102,8 @@
         """
         Private slot to handle changes of the Branch select button.
         
-        @param checked state of the button (boolean)
+        @param checked state of the button
+        @type bool
         """
         self.__updateOK()
     
@@ -111,7 +122,8 @@
         """
         Private slot to handle changes of the ID edit.
         
-        @param txt text of the edit (string)
+        @param txt text of the edit
+        @type str
         """
         self.__updateOK()
     
@@ -120,7 +132,8 @@
         """
         Private slot to handle changes of the Tag combo.
         
-        @param txt text of the combo (string)
+        @param txt text of the combo
+        @type str
         """
         self.__updateOK()
     
@@ -129,7 +142,8 @@
         """
         Private slot to handle changes of the Branch combo.
         
-        @param txt text of the combo (string)
+        @param txt text of the combo
+        @type str
         """
         self.__updateOK()
     
@@ -137,7 +151,8 @@
         """
         Private method to generate the revision.
         
-        @return revision (string)
+        @return revision
+        @rtype str
         """
         if self.numberButton.isChecked():
             return "rev({0})".format(self.numberSpinBox.value())