eric: comparison eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py

-:9eed155411f0
+:4a1db75550bd
 import os
 import re
 import shutil
 from urllib.parse import quote
-from PyQt5.QtCore import pyqtSignal, QProcess, QRegExp, QCoreApplication
+from PyQt5.QtCore import pyqtSignal, QProcess, QCoreApplication
 from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 self.blame = None
 self.repoBrowser = None
 self.logBrowser = None
 # regular expression object for evaluation of the status output
-self.rx_status1 = QRegExp(
+self.rx_status1 = re.compile(
 '(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)')
-self.rx_status2 = QRegExp('(.{8})\\s+(.+)\\s*')
+self.rx_status2 = re.compile('(.{8})\\s+(.+)\\s*')
 self.statusCache = {}
 self.__commitData = {}
 self.__commitDialog = None
 @param project reference to the project object
 @param target new name of the file/directory (string)
 @param noDialog flag indicating quiet operations
 @return flag indicating successfull operation (boolean)
 """
-rx_prot = QRegExp('(file:|svn:|svn+ssh:|http:|https:).+')
+rx_prot = re.compile('(file:|svn:|svn+ssh:|http:|https:).+')
 opts = self.options['global'][:]
 force = '--force' in opts
 if force:
 del opts[opts.index('--force')]
 if accepted:
 target, force = dlg.getData()
 if not target:
 return False
-if not rx_prot.exactMatch(target):
+if rx_prot.fullmatch(target) is None:
 isDir = os.path.isdir(name)
 else:
 isDir = False
 if accepted:
 args = []
 args.append('move')
 self.addArguments(args, opts)
 if force:
 args.append('--force')
-if rx_prot.exactMatch(target):
+if rx_prot.fullmatch(target) is not None:
 args.append('--message')
 args.append('Moving {0} to {1}'.format(name, target))
 target = self.__svnURL(target)
 args.append(name)
 args.append(target)
 .format(name))
 res = dia.startProcess(args)
 if res:
 dia.exec()
 res = dia.normalExit()
-if res and not rx_prot.exactMatch(target):
+if res and rx_prot.fullmatch(target) is None:
 if target.startswith(project.getProjectPath()):
 if isDir:
 project.moveDirectory(name, target)
 else:
 project.renameFileInPdata(name, target)
 self.allTagsBranchesList.insert(0, tag)
 else:
 return
 if self.otherData["standardLayout"]:
-rx_base = QRegExp('(.+)/(trunk|tags|branches).*')
+rx_base = re.compile('(.+)/(trunk|tags|branches).*')
-if not rx_base.exactMatch(reposURL):
+match = rx_base.fullmatch(reposURL)
+if match is None:
 E5MessageBox.critical(
 self.__ui,
 self.tr("Subversion Error"),
 self.tr(
 """The URL of the project repository has an"""
 """ invalid format. The tag operation will"""
 """ be aborted"""))
 return
-reposRoot = rx_base.cap(1)
+reposRoot = match.group(1)
 if tagOp in [1, 4]:
 url = '{0}/tags/{1}'.format(reposRoot, quote(tag))
 elif tagOp in [2, 8]:
 url = '{0}/branches/{1}'.format(reposRoot, quote(tag))
 else:
 self.allTagsBranchesList.insert(0, tag)
 else:
 return False
 if self.otherData["standardLayout"]:
-rx_base = QRegExp('(.+)/(trunk|tags|branches).*')
+rx_base = re.compile('(.+)/(trunk|tags|branches).*')
-if not rx_base.exactMatch(reposURL):
+match = rx_base.fullmatch(reposURL)
+if match is None:
 E5MessageBox.critical(
 self.__ui,
 self.tr("Subversion Error"),
 self.tr(
 """The URL of the project repository has an"""
 """ invalid format. The switch operation will"""
 """ be aborted"""))
 return False
-reposRoot = rx_base.cap(1)
+reposRoot = match.group(1)
 tn = tag
 if tagType == 1:
 url = '{0}/tags/{1}'.format(reposRoot, quote(tag))
 elif tagType == 2:
 url = '{0}/branches/{1}'.format(reposRoot, quote(tag))
 self.mergeList[0].insert(0, urlrev1)
 if urlrev2 in self.mergeList[1]:
 self.mergeList[1].remove(urlrev2)
 self.mergeList[1].insert(0, urlrev2)
-rx_rev = QRegExp('\\d+|HEAD')
+rx_rev = re.compile('\\d+|HEAD')
 args = []
 args.append('merge')
 self.addArguments(args, opts)
 if self.version >= (1, 5, 0):
 args.append('--accept')
 args.append('postpone')
 if force:
 args.append('--force')
-if rx_rev.exactMatch(urlrev1):
+if rx_rev.fullmatch(urlrev1) is not None:
 args.append('-r')
 args.append('{0}:{1}'.format(urlrev1, urlrev2))
 if not target:
 args.append(name)
 else:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
 output = str(process.readAllStandardOutput(), ioEncoding,
 'replace')
 for line in output.splitlines():
-if self.rx_status1.exactMatch(line):
+match = self.rx_status1.fullmatch(line)
-flags = str(self.rx_status1.cap(1))
+if match is not None:
-path = self.rx_status1.cap(5).strip()
+flags = self.rx_status1.group(1)
-elif self.rx_status2.exactMatch(line):
+path = self.rx_status1.group(5).strip()
-flags = str(self.rx_status2.cap(1))
-path = self.rx_status2.cap(2).strip()
 else:
-continue
+match = self.rx_status2.fullmatch(line)
+if match is not None:
+flags = self.rx_status2.group(1)
+path = self.rx_status2.group(2).strip()
+else:
+continue
 name = os.path.normcase(path)
 if flags[0] not in "?I":
 if name in names:
 names[name] = self.canBeCommitted
 self.statusCache[name] = self.canBeCommitted
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
 output = str(process.readAllStandardOutput(), ioEncoding,
 'replace')
 for line in output.splitlines():
-if self.rx_status1.exactMatch(line):
+match = self.rx_status1.fullmatch(line)
-flags = self.rx_status1.cap(1)
+if match is not None:
-path = self.rx_status1.cap(5).strip()
+flags = self.rx_status1.group(1)
-elif self.rx_status2.exactMatch(line):
+path = self.rx_status1.group(5).strip()
-flags = self.rx_status2.cap(1)
-path = self.rx_status2.cap(2).strip()
 else:
-continue
+match = self.rx_status2.fullmatch(line)
+if match is not None:
+flags = self.rx_status2.group(1)
+path = self.rx_status2.group(2).strip()
+else:
+continue
 name = os.path.normcase(path)
 if flags[0] not in "?I":
 if name in names:
 names[name] = self.canBeCommitted
 self.statusCache[name] = self.canBeCommitted
 @param name file/directory name to be copied (string)
 @param project reference to the project object
 @return flag indicating successfull operation (boolean)
 """
 from .SvnCopyDialog import SvnCopyDialog
-rx_prot = QRegExp('(file:|svn:|svn+ssh:|http:|https:).+')
+rx_prot = re.compile('(file:|svn:|svn+ssh:|http:|https:).+')
 dlg = SvnCopyDialog(name)
 res = False
 if dlg.exec() == QDialog.Accepted:
 target, force = dlg.getData()
 args = []
 args.append('copy')
 self.addArguments(args, self.options['global'])
-if rx_prot.exactMatch(target):
+match = rx_prot.fullmatch(target)
+if match is not None:
 args.append('--message')
 args.append('Copying {0} to {1}'.format(name, target))
 target = self.__svnURL(target)
 args.append(name)
 args.append(target)
 if res:
 dia.exec()
 res = dia.normalExit()
 if (
 res and
-not rx_prot.exactMatch(target) and
+match is None and
 target.startswith(project.getProjectPath())
 ):
 if os.path.isdir(name):
 project.copyDirectory(name, target)
 else:
 Public method to get a list of all defined change lists.
 @return list of defined change list names (list of strings)
 """
 changelists = []
-rx_changelist = QRegExp('--- \\S+ .([\\w\\s]+).:\\s*')
+rx_changelist = re.compile('--- \\S+ .([\\w\\s]+).:\\s*')
 # three dashes, Changelist (translated), quote,
 # changelist name, quote, :
 args = []
 args.append("status")
 output = str(process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 if output:
 for line in output.splitlines():
-if rx_changelist.exactMatch(line):
+match = rx_changelist.fullmatch(line)
-changelist = rx_changelist.cap(1)
+if match is not None:
+changelist = match.group(1)
 if changelist not in changelists:
 changelists.append(changelist)
 return changelists

Mercurial Repositories > eric / file comparison

comparison: eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py

eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py