diff -r fced5aa98d41 -r 5192a2592324 eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Wed Sep 22 19:52:28 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Thu Sep 23 18:20:31 2021 +0200
@@ -14,8 +14,6 @@
from .Ui_SvnCommitDialog import Ui_SvnCommitDialog
-import Preferences
-
class SvnCommitDialog(QWidget, Ui_SvnCommitDialog):
"""
@@ -27,20 +25,22 @@
accepted = pyqtSignal()
rejected = pyqtSignal()
- def __init__(self, changelists, parent=None):
+ def __init__(self, vcs, parent=None):
"""
Constructor
- @param changelists list of available change lists (list of strings)
+ @param vcs reference to the vcs object
@param parent parent widget (QWidget)
"""
super().__init__(parent, Qt.WindowType.Window)
self.setupUi(self)
+ self.__vcs = vcs
+
if pysvn.svn_version < (1, 5, 0) or pysvn.version < (1, 6, 0):
self.changeListsGroup.hide()
else:
- self.changeLists.addItems(sorted(changelists))
+ self.changeLists.addItems(sorted(vcs.svnGetChangelists()))
def showEvent(self, evt):
"""
@@ -48,11 +48,10 @@
@param evt the event (QShowEvent)
"""
- self.recentCommitMessages = Preferences.toList(
- Preferences.Prefs.settings.value('Subversion/Commits'))
+ commitMessages = self.__vcs.vcsCommitMessages()
self.recentComboBox.clear()
self.recentComboBox.addItem("")
- self.recentComboBox.addItems(self.recentCommitMessages)
+ self.recentComboBox.addItems(commitMessages)
self.logEdit.setFocus(Qt.FocusReason.OtherFocusReason)
@@ -67,14 +66,7 @@
"""
msg = self.logEdit.toPlainText()
if msg:
- if msg in self.recentCommitMessages:
- self.recentCommitMessages.remove(msg)
- self.recentCommitMessages.insert(0, msg)
- no = int(Preferences.Prefs.settings.value(
- 'Subversion/CommitMessages', 20))
- del self.recentCommitMessages[no:]
- Preferences.Prefs.settings.setValue(
- 'Subversion/Commits', self.recentCommitMessages)
+ self.__vcs.vcsAddCommitMessage(msg)
return msg
def hasChangelists(self):
