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

-:fb0ef164f536
+:698ae46f40a4
 import re
 import os
 import shutil
 import time
 from urllib.parse import quote
+import contextlib
 from PyQt5.QtCore import pyqtSignal, Qt, QDateTime, QCoreApplication
 from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
 from E5Gui.E5Application import e5App
 msg, " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 with E5MutexLocker(self.vcsExecutionMutex):
-if changelists:
+rev = (
-rev = client.checkin(fnames, msg,
+client.checkin(
-recurse=recurse, keep_locks=keeplocks,
+fnames, msg, recurse=recurse, keep_locks=keeplocks,
 keep_changelist=keepChangelists,
 changelists=changelists)
-else:
+if changelists else
-rev = client.checkin(fnames, msg,
+client.checkin(
-recurse=recurse, keep_locks=keeplocks)
+fnames, msg, recurse=recurse, keep_locks=keeplocks)
+)
 except pysvn.ClientError as e:
 rev = None
 if not noDialog:
 dlg.showError(e.args[0])
 if not noDialog:
 if accepted:
 target, force = dlg.getData()
 if not target:
 return False
-if rx_prot.fullmatch(target) is None:
+isDir = (os.path.isdir(name) if rx_prot.fullmatch(target) is None
-isDir = os.path.isdir(name)
+else False)
-else:
-isDir = False
 if accepted:
 client = self.getClient()
 if rx_prot.fullmatch(target) is not None:
 target = self.__svnURL(target)
 being edited and has unsaved modification, they can be saved or the
 operation may be aborted.
 @param name file/directory name to be diffed (string)
 """
-if isinstance(name, list):
+names = name[:] if isinstance(name, list) else [name]
-names = name[:]
-else:
-names = [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = e5App().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 return
 """The URL of the project repository could not be"""
 """ retrieved from the working copy. The tag operation"""
 """ will be aborted"""))
 return
-if self.otherData["standardLayout"]:
+url = (
-url = None
+None
-else:
+if self.otherData["standardLayout"] else
-url = self.svnNormalizeURL(reposURL)
+self.svnNormalizeURL(reposURL)
+)
 from .SvnTagDialog import SvnTagDialog
 dlg = SvnTagDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
 if dlg.exec() == QDialog.DialogCode.Accepted:
 tag, tagOp = dlg.getParameters()
 """The URL of the project repository could not be"""
 """ retrieved from the working copy. The switch"""
 """ operation will be aborted"""))
 return False
-if self.otherData["standardLayout"]:
+url = (
-url = None
+None
-else:
+if self.otherData["standardLayout"] else
-url = self.svnNormalizeURL(reposURL)
+self.svnNormalizeURL(reposURL)
+)
 from .SvnSwitchDialog import SvnSwitchDialog
 dlg = SvnSwitchDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
 if dlg.exec() == QDialog.DialogCode.Accepted:
 tag, tagType = dlg.getParameters()
 if dname.endswith(os.sep):
 dname = dname[:-1]
 dname = os.path.normcase(dname)
 found = False
-for name in self.statusCache.keys():
+for name in self.statusCache:
 if name in names:
 found = True
 names[name] = self.statusCache[name]
 if not found:
 client.callback_get_login = mixin._clientLoginCallback
 client.callback_ssl_server_trust_prompt = (
 mixin._clientSslServerTrustPromptCallback
 )
-try:
+with contextlib.suppress(pysvn.ClientError):
 with E5MutexLocker(self.vcsExecutionMutex):
 allFiles = client.status(dname, recurse=True, get_all=True,
 ignore=True, update=False)
 dirs = [x for x in names.keys() if os.path.isdir(x)]
 for file in allFiles:
 self.statusCache[d] = self.canBeCommitted
 dirs.remove(d)
 break
 else:
 self.statusCache[name] = self.canBeAdded
-except pysvn.ClientError:
-# ignore pysvn errors
-pass
 return names
 def __vcsAllRegisteredStates_wc(self, names, dname, shortcut=True):
 """
 client.callback_get_login = mixin._clientLoginCallback
 client.callback_ssl_server_trust_prompt = (
 mixin._clientSslServerTrustPromptCallback
 )
-try:
+with contextlib.suppress(pysvn.ClientError):
 with E5MutexLocker(self.vcsExecutionMutex):
 allFiles = client.status(dname, recurse=True, get_all=True,
 ignore=True, update=False)
 for file in allFiles:
 name = os.path.normcase(file.path)
 if name in names:
 names[name] = self.canBeCommitted
 self.statusCache[name] = self.canBeCommitted
 else:
 self.statusCache[name] = self.canBeAdded
-except pysvn.ClientError:
-# ignore pysvn errors
-pass
 return names
 def __isVersioned(self, status):
 """
 try:
 entry = self.getClient().info(ppath)
 except pysvn.ClientError as e:
 return e.args[0]
-if hasattr(pysvn, 'svn_api_version'):
+apiVersion = (
-apiVersion = "{0} {1}".format(
+"{0} {1}".format(
 ".".join([str(v) for v in pysvn.svn_api_version[:3]]),
 pysvn.svn_api_version[3])
-else:
+if hasattr(pysvn, 'svn_api_version') else
-apiVersion = QCoreApplication.translate('subversion', "unknown")
+QCoreApplication.translate('subversion', "unknown")
+)
 hmsz = time.strftime("%H:%M:%S %Z", time.localtime(entry.commit_time))
 return QCoreApplication.translate(
 'subversion',
 """<h3>Repository information</h3>"""
 This method gives the chance to enter the revisions to be compared.
 @param name file/directory name to be diffed (string)
 """
-if isinstance(name, list):
+names = name[:] if isinstance(name, list) else [name]
-names = name[:]
-else:
-names = [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = e5App().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 return
 This method gives the chance to enter the revisions to be compared.
 @param name file/directory name to be diffed (string)
 """
-if isinstance(name, list):
+names = name[:] if isinstance(name, list) else [name]
-names = name[:]
-else:
-names = [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = e5App().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 return
 """
 Public method to open the repository browser.
 @param projectPath path name of the project (string)
 """
-if projectPath:
+url = self.svnGetReposName(projectPath) if projectPath else None
-url = self.svnGetReposName(projectPath)
-else:
-url = None
 if url is None:
 url, ok = QInputDialog.getText(
 None,
 self.tr("Repository Browser"),
 self.tr("Enter the repository URL."),
 """
 changelists = []
 client = self.getClient()
 if hasattr(client, 'get_changelist'):
 ppath = e5App().getObject("Project").getProjectPath()
-try:
+with contextlib.suppress(pysvn.ClientError):
 with E5MutexLocker(self.vcsExecutionMutex):
 entries = client.get_changelist(
 ppath, depth=pysvn.depth.infinity)
 for entry in entries:
 changelist = entry[1]
 if changelist not in changelists:
 changelists.append(changelist)
-except pysvn.ClientError:
-pass
 return changelists
 def svnUpgrade(self, path):
 """

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py