Thu, 06 Mar 2014 18:34:59 +0100
Corrected some Mercurial input dialogs offering to enter either a revision number or a changeset id to use rev() and id() to make the operation unambigous.
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py Thu Mar 06 18:24:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py Thu Mar 06 18:34:59 2014 +0100 @@ -187,9 +187,9 @@ (string, string) """ if self.numberButton.isChecked(): - rev = str(self.numberSpinBox.value()) + rev = "rev({0})".format(self.numberSpinBox.value()) elif self.idButton.isChecked(): - rev = self.idEdit.text() + rev = "id({0})".format(self.idEdit.text()) elif self.tagButton.isChecked(): rev = self.tagCombo.currentText() elif self.branchButton.isChecked():
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Thu Mar 06 18:24:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Thu Mar 06 18:34:59 2014 +0100 @@ -138,9 +138,9 @@ signature (string, boolean, string, string, boolean, boolean) """ if self.numberButton.isChecked(): - rev = str(self.numberSpinBox.value()) + rev = "rev({0})".format(self.numberSpinBox.value()) elif self.idButton.isChecked(): - rev = self.idEdit.text() + rev = "id({0})".format(self.idEdit.text()) elif self.tagButton.isChecked(): rev = self.tagCombo.currentText() elif self.branchButton.isChecked():
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Thu Mar 06 18:24:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Thu Mar 06 18:34:59 2014 +0100 @@ -151,9 +151,9 @@ (string, boolean, string, string, string) """ if self.numberButton.isChecked(): - rev = str(self.numberSpinBox.value()) + rev = "rev({0})".format(self.numberSpinBox.value()) elif self.idButton.isChecked(): - rev = self.idEdit.text() + rev = "id({0})".format(self.idEdit.text()) elif self.tagButton.isChecked(): rev = self.tagCombo.currentText() elif self.branchButton.isChecked():
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Thu Mar 06 18:24:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Thu Mar 06 18:34:59 2014 +0100 @@ -136,9 +136,9 @@ forced merge (string, boolean) """ if self.numberButton.isChecked(): - rev = str(self.numberSpinBox.value()) + rev = "rev({0})".format(self.numberSpinBox.value()) elif self.idButton.isChecked(): - rev = self.idEdit.text() + rev = "id({0})".format(self.idEdit.text()) elif self.tagButton.isChecked(): rev = self.tagCombo.currentText() elif self.branchButton.isChecked():
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Thu Mar 06 18:24:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Thu Mar 06 18:34:59 2014 +0100 @@ -142,9 +142,9 @@ @return selected revision (string) """ if self.numberButton.isChecked(): - rev = str(self.numberSpinBox.value()) + rev = "rev({0})".format(self.numberSpinBox.value()) elif self.idButton.isChecked(): - rev = self.idEdit.text() + rev = "id({0})".format(self.idEdit.text()) elif self.tagButton.isChecked(): rev = self.tagCombo.currentText() elif self.branchButton.isChecked():
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Thu Mar 06 18:24:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Thu Mar 06 18:34:59 2014 +0100 @@ -249,9 +249,9 @@ prevButton = self.prev2Button 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():
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Thu Mar 06 18:24:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Thu Mar 06 18:34:59 2014 +0100 @@ -246,9 +246,9 @@ tipButton = self.tip2Button 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():