Mercurial Repositories > eric / changeset
changeset
Corrected some forgotten sort calls.
Sun, 05 Dec 2010 18:11:22 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 05 Dec 2010 18:11:22 +0100
- branch
- 5_0_x
- changeset 738
- 170c7b28ba3f
- parent 732
- e9e36c342b13
- child 745
- c2a3fad92182
Corrected some forgotten sort calls.
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -27,8 +27,8 @@ QDialog.__init__(self, parent) self.setupUi(self) - self.tagCombo.addItems(list(sorted(tagsList))) - self.branchCombo.addItems(list(sorted(["default"] + branchesList))) + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["default"] + sorted(branchesList)) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) self.okButton.setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -27,8 +27,8 @@ self.setupUi(self) self.compressionCombo.addItems(["", "bzip2", "gzip", "none"]) - self.tagCombo.addItems(list(sorted(tagsList))) - self.branchCombo.addItems(list(sorted(["default"] + branchesList))) + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["default"] + sorted(branchesList)) def getParameters(self): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -28,8 +28,8 @@ self.setupUi(self) self.forceCheckBox.setChecked(force) - self.tagCombo.addItems(list(sorted(tagsList))) - self.branchCombo.addItems(list(sorted(["default"] + branchesList))) + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["default"] + sorted(branchesList)) def getParameters(self): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -27,8 +27,8 @@ QDialog.__init__(self, parent) self.setupUi(self) - self.tagCombo.addItems(list(sorted(tagsList))) - self.branchCombo.addItems(list(sorted(["default"] + branchesList))) + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["default"] + sorted(branchesList)) if showNone: self.tipButton.setText(self.trUtf8("No revision selected"))
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -26,10 +26,10 @@ QDialog.__init__(self, parent) self.setupUi(self) - self.tag1Combo.addItems(list(sorted(tagsList))) - self.tag2Combo.addItems(list(sorted(tagsList))) - self.branch1Combo.addItems(list(sorted(["default"] + branchesList))) - self.branch2Combo.addItems(list(sorted(["default"] + branchesList))) + self.tag1Combo.addItems(sorted(tagsList)) + self.tag2Combo.addItems(sorted(tagsList)) + self.branch1Combo.addItems(["default"] + sorted(branchesList)) + self.branch2Combo.addItems(["default"] + sorted(branchesList)) def __getRevision(self, no): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -35,7 +35,7 @@ self.okButton.setEnabled(False) self.tagCombo.clear() - self.tagCombo.addItems(taglist) + self.tagCombo.addItems(sorted(taglist)) @pyqtSlot(str) def on_tagCombo_editTextChanged(self, text):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -30,7 +30,7 @@ self.setupUi(self) self.tagCombo.clear() - self.tagCombo.addItems(taglist) + self.tagCombo.addItems(sorted(taglist)) if reposURL is not None and reposURL != "": self.tagCombo.setEditText(reposURL)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -33,7 +33,7 @@ self.okButton.setEnabled(False) self.tagCombo.clear() - self.tagCombo.addItems(taglist) + self.tagCombo.addItems(sorted(taglist)) if reposURL is not None and reposURL != "": self.tagCombo.setEditText(reposURL)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -78,11 +78,11 @@ reposURL = reposURL.replace(path, '') self.repoRootLabel1.hide() self.typeCombo1.hide() - self.labelCombo1.addItems([reposURL] + self.vcs.tagsList) + self.labelCombo1.addItems([reposURL] + sorted(self.vcs.tagsList)) self.labelCombo1.setEnabled(True) self.repoRootLabel2.hide() self.typeCombo2.hide() - self.labelCombo2.addItems([reposURL] + self.vcs.tagsList) + self.labelCombo2.addItems([reposURL] + sorted(self.vcs.tagsList)) self.labelCombo2.setEnabled(True) def __changeLabelCombo(self, labelCombo, type_): @@ -105,7 +105,7 @@ elif type_ == "branches/": labelCombo.clear() labelCombo.clearEditText() - labelCombo.addItems(self.branchesList) + labelCombo.addItems(sorted(self.branchesList)) labelCombo.setEnabled(True) @pyqtSlot(str) @@ -144,4 +144,4 @@ url1 = self.labelCombo1.currentText() url2 = self.labelCombo2.currentText() - return [url1, url2], self.summaryCheckBox.isChecked() \ No newline at end of file + return [url1, url2], self.summaryCheckBox.isChecked()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -30,7 +30,7 @@ self.setupUi(self) self.tagCombo.clear() - self.tagCombo.addItems(taglist) + self.tagCombo.addItems(sorted(taglist)) if reposURL is not None and reposURL != "": self.tagCombo.setEditText(reposURL)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -33,7 +33,7 @@ self.okButton.setEnabled(False) self.tagCombo.clear() - self.tagCombo.addItems(taglist) + self.tagCombo.addItems(sorted(taglist)) if reposURL is not None and reposURL != "": self.tagCombo.setEditText(reposURL)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -76,11 +76,11 @@ reposURL = reposURL.replace(path, '') self.repoRootLabel1.hide() self.typeCombo1.hide() - self.labelCombo1.addItems([reposURL] + self.vcs.tagsList) + self.labelCombo1.addItems([reposURL] + sorted(self.vcs.tagsList)) self.labelCombo1.setEnabled(True) self.repoRootLabel2.hide() self.typeCombo2.hide() - self.labelCombo2.addItems([reposURL] + self.vcs.tagsList) + self.labelCombo2.addItems([reposURL] + sorted(self.vcs.tagsList)) self.labelCombo2.setEnabled(True) def __changeLabelCombo(self, labelCombo, type_): @@ -103,7 +103,7 @@ elif type_ == "branches/": labelCombo.clear() labelCombo.clearEditText() - labelCombo.addItems(self.branchesList) + labelCombo.addItems(sorted(self.branchesList)) labelCombo.setEnabled(True) @pyqtSlot(str) @@ -142,4 +142,4 @@ url1 = self.labelCombo1.currentText() url2 = self.labelCombo2.currentText() - return [url1, url2], self.summaryCheckBox.isChecked() \ No newline at end of file + return [url1, url2], self.summaryCheckBox.isChecked()
--- a/Preferences/ConfigurationPages/CooperationPage.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Preferences/ConfigurationPages/CooperationPage.py Sun Dec 05 18:11:22 2010 +0100 @@ -46,8 +46,8 @@ self.autoAcceptCheckBox.setChecked( Preferences.getCooperation("AutoAcceptConnections")) - self.bannedUsersList.addItems(list(sorted( - Preferences.getCooperation("BannedUsers")))) + self.bannedUsersList.addItems(sorted( + Preferences.getCooperation("BannedUsers"))) def save(self): """
