Changed some Mercurial dialogs asking for a (tag, branch,...) name to convert spaces to underscores because spaces are not really recommended. 5_4_x

Wed, 19 Mar 2014 19:26:30 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 19 Mar 2014 19:26:30 +0100
branch
5_4_x
changeset 3409
b7a3455e9ba0
parent 3405
ed72a8e08be4
child 3411
d8290ca5b8ea

Changed some Mercurial dialogs asking for a (tag, branch,...) name to convert spaces to underscores because spaces are not really recommended.
(grafted from b6e6a7062d12752db6c0c0dc68f0f367bb8a94e6)

Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py	Tue Mar 18 19:23:35 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py	Wed Mar 19 19:26:30 2014 +0100
@@ -200,8 +200,8 @@
             rev = ""
         
         if self.__mode == self.MOVE_MODE:
-            name = self.nameCombo.currentText()
+            name = self.nameCombo.currentText().replace(" ", "_")
         else:
-            name = self.nameEdit.text()
+            name = self.nameEdit.text().replace(" ", "_")
         
         return rev, name
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py	Tue Mar 18 19:23:35 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py	Wed Mar 19 19:26:30 2014 +0100
@@ -65,4 +65,7 @@
         @return tuple naming the new and old bookmark names
             (string, string)
         """
-        return self.nameEdit.text(), self.bookmarkCombo.currentText()
+        return (
+            self.nameEdit.text().replace(" ", "_"),
+            self.bookmarkCombo.currentText().replace(" ", "_")
+        )
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Tue Mar 18 19:23:35 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Wed Mar 19 19:26:30 2014 +0100
@@ -53,7 +53,7 @@
         
         @return tuple of string and int (tag, tag operation)
         """
-        tag = self.tagCombo.currentText()
+        tag = self.tagCombo.currentText().replace(" ", "_")
         tagOp = 0
         if self.createRegularButton.isChecked():
             tagOp = HgTagDialog.CreateRegularTag
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Tue Mar 18 19:23:35 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Wed Mar 19 19:26:30 2014 +0100
@@ -126,5 +126,5 @@
         dateData = (self.dateGroup.isChecked(),
                     self.currentDateCheckBox.isChecked(),
                     self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm"))
-        return (self.nameEdit.text(), self.messageEdit.toPlainText(),
-                userData, dateData)
+        return (self.nameEdit.text().replace(" ", "_"),
+                self.messageEdit.toPlainText(), userData, dateData)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Tue Mar 18 19:23:35 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Wed Mar 19 19:26:30 2014 +0100
@@ -177,7 +177,7 @@
         """
         name = ""
         if self.__mode == HgQueuesQueueManagementDialog.NAME_INPUT:
-            name = self.nameEdit.text()
+            name = self.nameEdit.text().replace(" ", "_")
         elif self.__mode == HgQueuesQueueManagementDialog.QUEUE_INPUT:
             selItems = self.queuesList.selectedItems()
             if selItems:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py	Tue Mar 18 19:23:35 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py	Wed Mar 19 19:26:30 2014 +0100
@@ -81,4 +81,4 @@
         if self.namedButton.isChecked():
             selectedPatch = self.nameCombo.currentText()
         
-        return self.nameEdit.text(), selectedPatch
+        return self.nameEdit.text().replace(" ", "_"), selectedPatch

eric ide

mercurial