diff -r 9eed155411f0 -r 4a1db75550bd eric6/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sat Oct 10 16:03:53 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sun Oct 11 17:54:52 2020 +0200
@@ -7,8 +7,8 @@
Module implementing a dialog to enter the data for a merge operation.
"""
+import re
-from PyQt5.QtCore import QRegExp
from PyQt5.QtWidgets import QDialog, QDialogButtonBox
from .Ui_SvnMergeDialog import Ui_SvnMergeDialog
@@ -36,8 +36,8 @@
self.forceCheckBox.setChecked(force)
- self.rx_url = QRegExp('(?:file:|svn:|svn+ssh:|http:|https:)//.+')
- self.rx_rev = QRegExp('\\d+')
+ self.rx_url = re.compile('(?:file:|svn:|svn+ssh:|http:|https:)//.+')
+ self.rx_rev = re.compile('\\d+')
self.tag1Combo.clear()
self.tag1Combo.addItems(mergelist1)
@@ -59,11 +59,12 @@
self.okButton.setDisabled(
self.tag1Combo.currentText() != "" or
self.tag2Combo.currentText() != "" or
- not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and
- self.rx_url.exactMatch(self.tag2Combo.currentText())) or
- (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and
- self.rx_rev.exactMatch(self.tag2Combo.currentText()))
- )
+ not (
+ (bool(self.rx_url.fullmatch(self.tag1Combo.currentText())) and
+ bool(self.rx_url.fullmatch(self.tag2Combo.currentText()))) or
+ (bool(self.rx_rev.fullmatch(self.tag1Combo.currentText())) and
+ bool(self.rx_rev.fullmatch(self.tag2Combo.currentText())))
+ )
)
def on_tag1Combo_editTextChanged(self, text):
