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

-:7c017076c12e
+:4cc6f121119a
 import os
 import shutil
 import time
 from urllib.parse import quote
-from PyQt5.QtCore import Qt, QMutexLocker, pyqtSignal, QRegExp, QDateTime, \
+from PyQt5.QtCore import (
-QCoreApplication
+Qt, QMutexLocker, pyqtSignal, QRegExp, QDateTime, QCoreApplication
+)
 from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 ]
 self.commandHistory = []
 self.wdHistory = []
-if pysvn.version >= (1, 4, 3, 0) and \
+if (
-"SVN_ASP_DOT_NET_HACK" in os.environ:
+pysvn.version >= (1, 4, 3, 0) and
+"SVN_ASP_DOT_NET_HACK" in os.environ
+):
 self.adminDir = '_svn'
 else:
 self.adminDir = '.svn'
 self.log = None
 if self.otherData["standardLayout"]:
 if tag is None or tag == '':
 svnUrl = '{0}/trunk'.format(vcsDir)
 else:
-if not tag.startswith('tags') and \
+if (
-not tag.startswith('branches'):
+not tag.startswith('tags') and
+not tag.startswith('branches')
+):
 type_, ok = QInputDialog.getItem(
 None,
 self.tr("Subversion Checkout"),
 self.tr(
 "The tag must be a normal tag (tags) or"
 if self.otherData["standardLayout"]:
 if tag is None or tag == '':
 svnUrl = '{0}/trunk'.format(vcsDir)
 else:
-if not tag.startswith('tags') and \
+if (
-not tag.startswith('branches'):
+not tag.startswith('tags') and
+not tag.startswith('branches')
+):
 type_, ok = QInputDialog.getItem(
 None,
 self.tr("Subversion Export"),
 self.tr(
 "The tag must be a normal tag (tags) or"
 # check for commit of the project
 if os.path.isdir(nam):
 project = e5App().getObject("Project")
 if nam == project.getProjectPath():
 ok &= project.checkAllScriptsDirty(
-reportSyntaxErrors=True) and \
+reportSyntaxErrors=True) and project.checkDirty()
-project.checkDirty()
 continue
 elif os.path.isfile(nam):
-editor = e5App().getObject("ViewManager")\
+editor = e5App().getObject("ViewManager").getOpenEditor(
-.getOpenEditor(nam)
+nam)
 if editor:
 ok &= editor.checkDirty()
 if not ok:
 break
 return
 if self.__commitDialog is not None:
 msg = self.__commitDialog.logMessage()
 if self.__commitDialog.hasChangelists():
-changelists, keepChangelists = \
+changelists, keepChangelists = (
 self.__commitDialog.changelistsData()
+)
 else:
 changelists, keepChangelists = [], False
 self.__commitDialog.deleteLater()
 self.__commitDialog = None
 else:
 dname, fnames = self.splitPathList(name)
 else:
 dname, fname = self.splitPath(name)
 fnames = [fname]
-if self.svnGetReposName(dname).startswith('http') or \
+if (
-self.svnGetReposName(dname).startswith('svn'):
+self.svnGetReposName(dname).startswith('http') or
+self.svnGetReposName(dname).startswith('svn')
+):
 noDialog = False
 locker = QMutexLocker(self.vcsExecutionMutex)
 cwd = os.getcwd()
 os.chdir(dname)
 repodir = dname
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
-while os.path.normcase(dname) != os.path.normcase(repodir) and \
+while (
+os.path.normcase(dname) != os.path.normcase(repodir) and
 (os.path.normcase(dname) not in self.statusCache or
 self.statusCache[os.path.normcase(dname)] ==
-self.canBeAdded):
+self.canBeAdded)
+):
 # add directories recursively, if they aren't in the
 # repository already
 tree.insert(-1, dname)
 dname = os.path.dirname(dname)
 wdir = dname
 while not os.path.isdir(
 os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
-while (os.path.normcase(d) !=
+while (
-os.path.normcase(repodir)) and \
+(os.path.normcase(d) != os.path.normcase(repodir)) and
-(d not in tree2 + tree) and \
+(d not in tree2 + tree) and
 (os.path.normcase(d) not in self.statusCache or
 self.statusCache[os.path.normcase(d)] ==
-self.canBeAdded):
+self.canBeAdded)
+):
 tree2.append(d)
 d = os.path.dirname(d)
 else:
 while not os.path.exists(os.path.join(d, self.adminDir)):
 if d in tree2 + tree:
 while not os.path.isdir(
 os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
-while (os.path.normcase(d) !=
+while (
-os.path.normcase(repodir)) and \
+(os.path.normcase(d) != os.path.normcase(repodir)) and
-(d not in tree) and \
+(d not in tree) and
 (os.path.normcase(d) not in self.statusCache or
 self.statusCache[os.path.normcase(d)] ==
-self.canBeAdded):
+self.canBeAdded)
+):
 tree.append(d)
 d = os.path.dirname(d)
 else:
 while not os.path.exists(os.path.join(d, self.adminDir)):
 # add directories recursively,
 repodir = dname
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
-while (os.path.normcase(dname) !=
+while (
-os.path.normcase(repodir)) and \
+(os.path.normcase(dname) != os.path.normcase(repodir)) and
 (os.path.normcase(dname) not in self.statusCache or
 self.statusCache[os.path.normcase(dname)] ==
-self.canBeAdded):
+self.canBeAdded)
+):
 # add directories recursively, if they aren't in the
 # repository already
 tree.insert(-1, dname)
 dname = os.path.dirname(dname)
 else:
 log = "Moving {0} to {1}".format(name, target)
 else:
 log = ""
 target = target
 if not noDialog:
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.tr('Moving {0}').format(name),
-self.tr('Moving {0}').format(name),
+"move{0}{1} {2} {3}".format(
-"move{0}{1} {2} {3}".format(
+force and " --force" or "",
-force and " --force" or "",
+log and (" --message {0}".format(log)) or "",
-log and (" --message {0}".format(log)) or "",
+name, target),
-name, target),
+client, log=log)
-client, log=log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.move(name, target, force=force)
 res = True
 recurse = True
 project = e5App().getObject("Project")
 names = [project.getRelativePath(nam) for nam in name]
 if names[0]:
-from UI.DeleteFilesConfirmationDialog import \
+from UI.DeleteFilesConfirmationDialog import (
 DeleteFilesConfirmationDialog
+)
 dia = DeleteFilesConfirmationDialog(
 self.parent(),
 self.tr("Revert changes"),
 self.tr(
 "Do you really want to revert all changes to these files"
 else:
 url2 = urlrev2
 revision2 = pysvn.Revision(pysvn.opt_revision_kind.unspecified)
 rev2 = ""
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.tr('Merging {0}').format(name),
-self.tr('Merging {0}').format(name),
+"merge{0}{1} {2} {3} {4}".format(
-"merge{0}{1} {2} {3} {4}".format(
+(not recurse) and " --non-recursive" or "",
-(not recurse) and " --non-recursive" or "",
+force and " --force" or "",
-force and " --force" or "",
+"{0}{1}".format(url1, rev1 and ("@" + rev1) or ""),
-"{0}{1}".format(url1, rev1 and ("@" + rev1) or ""),
+"{0}{1}".format(url2, rev2 and ("@" + rev2) or ""),
-"{0}{1}".format(url2, rev2 and ("@" + rev2) or ""),
+fname),
-fname),
+client)
-client)
 QApplication.processEvents()
 try:
 client.merge(url1, revision1, url2, revision2, fname,
 recurse=recurse, force=force)
 except pysvn.ClientError as e:
 return names
 from .SvnDialogMixin import SvnDialogMixin
 mixin = SvnDialogMixin()
 client = self.getClient()
-client.callback_get_login = \
+client.callback_get_login = mixin._clientLoginCallback
-mixin._clientLoginCallback
+client.callback_ssl_server_trust_prompt = (
-client.callback_ssl_server_trust_prompt = \
 mixin._clientSslServerTrustPromptCallback
+)
 try:
 locker = QMutexLocker(self.vcsExecutionMutex)
 allFiles = client.status(dname, recurse=True, get_all=True,
 ignore=True, update=False)
 name = os.path.normcase(file.path)
 if self.__isVersioned(file):
 if name in names:
 names[name] = self.canBeCommitted
 dn = name
-while os.path.splitdrive(dn)[1] != os.sep and \
+while (
-dn != repodir:
+os.path.splitdrive(dn)[1] != os.sep and
+dn != repodir
+):
 dn = os.path.dirname(dn)
-if dn in self.statusCache and \
+if (
-self.statusCache[dn] == self.canBeCommitted:
+dn in self.statusCache and
+self.statusCache[dn] ==
+self.canBeCommitted
+):
 break
 self.statusCache[dn] = self.canBeCommitted
 self.statusCache[name] = self.canBeCommitted
 if dirs:
 for d in dirs:
 if not found:
 from .SvnDialogMixin import SvnDialogMixin
 mixin = SvnDialogMixin()
 client = self.getClient()
-client.callback_get_login = \
+client.callback_get_login = mixin._clientLoginCallback
-mixin._clientLoginCallback
+client.callback_ssl_server_trust_prompt = (
-client.callback_ssl_server_trust_prompt = \
 mixin._clientSslServerTrustPromptCallback
+)
 try:
 locker = QMutexLocker(self.vcsExecutionMutex)
 allFiles = client.status(dname, recurse=True, get_all=True,
 ignore=True, update=False)
 self.wdHistory.insert(0, wd)
 args = []
 self.addArguments(args, commandList)
-from Plugins.VcsPlugins.vcsSubversion.SvnDialog import \
+from Plugins.VcsPlugins.vcsSubversion.SvnDialog import (
 SvnDialog as SvnProcessDialog
+)
 dia = SvnProcessDialog(self.tr('Subversion command'))
 res = dia.startProcess(args, wd)
 if res:
 dia.exec_()
 """<tr><td><b>Committed revision</b></td><td>{5}</td></tr>"""
 """<tr><td><b>Committed date</b></td><td>{6}</td></tr>"""
 """<tr><td><b>Comitted time</b></td><td>{7}</td></tr>"""
 """<tr><td><b>Last author</b></td><td>{8}</td></tr>"""
 """</table>"""
-)\
+).format(
-.format(".".join([str(v) for v in pysvn.version]),
+".".join([str(v) for v in pysvn.version]),
 ".".join([str(v) for v in pysvn.svn_version[:3]]),
 apiVersion,
 entry.url,
 entry.revision.number,
 entry.commit_revision.number,
 time.strftime(
 "%Y-%m-%d", time.localtime(entry.commit_time)),
 hmsz,
 entry.commit_author
 )
 ###########################################################################
 ## Public Subversion specific methods are below.
 ###########################################################################
 target = self.__svnURL(target)
 log = "Copying {0} to {1}".format(name, target)
 else:
 log = ""
 target = target
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.tr('Copying {0}').format(name),
-self.tr('Copying {0}').format(name),
+"copy{0} {1} {2}".format(
-"copy{0} {1} {2}".format(
+log and (" --message {0}".format(log)) or "",
-log and (" --message {0}".format(log)) or "",
+name, target),
-name, target),
+client, log=log)
-client, log=log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.copy(name, target)
 res = True
 res = False
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
 dlg.exec_()
-if res and \
+if (
-not rx_prot.exactMatch(target) and \
+res and
-target.startswith(project.getProjectPath()):
+not rx_prot.exactMatch(target) and
+target.startswith(project.getProjectPath())
+):
 if os.path.isdir(name):
 project.copyDirectory(name, target)
 else:
 project.appendFile(target)
 return res
 cwd = os.getcwd()
 os.chdir(dname)
 opts = self.options['global']
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.tr('Subversion Set Property'),
-self.tr('Subversion Set Property'),
+"propset{0}{1} {2} {3} {4}".format(
-"propset{0}{1} {2} {3} {4}".format(
+recurse and " --recurse" or "",
-recurse and " --recurse" or "",
+skipchecks and " --skip-checks" or "",
-skipchecks and " --skip-checks" or "",
+propName, propValue,
-propName, propValue,
+" ".join(fnames)),
-" ".join(fnames)),
+client)
-client)
 QApplication.processEvents()
 try:
 for name in fnames:
 client.propset(propName, propValue, name,
 recurse=recurse, skip_checks=skipchecks)
 cwd = os.getcwd()
 os.chdir(dname)
 opts = self.options['global']
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.tr('Subversion Delete Property'),
-self.tr('Subversion Delete Property'),
+"propdel{0}{1} {2} {3}".format(
-"propdel{0}{1} {2} {3}".format(
+recurse and " --recurse" or "",
-recurse and " --recurse" or "",
+skipchecks and " --skip-checks" or "",
-skipchecks and " --skip-checks" or "",
+propName, " ".join(fnames)),
-propName, " ".join(fnames)),
+client)
-client)
 QApplication.processEvents()
 try:
 for name in fnames:
 client.propdel(propName, name,
 recurse=recurse, skip_checks=skipchecks)
 res = self.tagbranchList.start(path, tags)
 if res:
 if tags:
 self.tagsList = self.tagbranchList.getTagList()
 if not self.showedTags:
-self.allTagsBranchesList = \
+self.allTagsBranchesList = (
-self.allTagsBranchesList + self.tagsList
+self.allTagsBranchesList +
+self.tagsList
+)
 self.showedTags = True
 elif not tags:
 self.branchesList = self.tagbranchList.getTagList()
 if not self.showedBranches:
-self.allTagsBranchesList = \
+self.allTagsBranchesList = (
-self.allTagsBranchesList + self.branchesList
+self.allTagsBranchesList +
+self.branchesList
+)
 self.showedBranches = True
 def svnBlame(self, name):
 """
 Public method to show the output of the svn blame command.
 locker = QMutexLocker(self.vcsExecutionMutex)
 cwd = os.getcwd()
 os.chdir(dname)
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.tr('Locking in the Subversion repository'),
-self.tr('Locking in the Subversion repository'),
+"lock{0}{1} {2}".format(
-"lock{0}{1} {2}".format(
+stealIt and " --force" or "",
-stealIt and " --force" or "",
+comment and (" --message {0}".format(comment)) or "",
-comment and (" --message {0}".format(comment)) or "",
+" ".join(fnames)),
-" ".join(fnames)),
+client, parent=parent)
-client, parent=parent)
 QApplication.processEvents()
 try:
 client.lock(fnames, comment, force=stealIt)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker = QMutexLocker(self.vcsExecutionMutex)
 cwd = os.getcwd()
 os.chdir(dname)
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.tr('Unlocking in the Subversion repository'),
-self.tr('Unlocking in the Subversion repository'),
+"unlock{0} {1}".format(breakIt and " --force" or "",
-"unlock{0} {1}".format(
+" ".join(fnames)),
-breakIt and " --force" or "",
+client, parent=parent)
-" ".join(fnames)),
-client, parent=parent)
 QApplication.processEvents()
 try:
 client.unlock(fnames, force=breakIt)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 msg = "switch {0} {1}".format(newUrl, projectPath)
 else:
 msg = "relocate {0} {1} {2}".format(currUrl, newUrl,
 projectPath)
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(self.tr('Relocating'), msg, client)
-SvnDialog(self.tr('Relocating'), msg, client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 if inside:
 client.switch(projectPath, newUrl)
 (string)
 """
 if not isinstance(names, list):
 names = [names]
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(self.tr('Remove from changelist'),
+self.tr('Remove from changelist'),
 "changelist --remove {0}".format(" ".join(names)),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 for name in names:
 client.remove_from_changelists(name)
 0, True)
 if not ok or not clname:
 return
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(self.tr('Add to changelist'),
+self.tr('Add to changelist'),
 "changelist {0}".format(" ".join(names)),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 for name in names:
 client.add_to_changelist(name, clname,
 Public method to upgrade the working copy format.
 @param path directory name to show change lists for (string)
 """
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(self.tr('Upgrade'),
+self.tr('Upgrade'),
 "upgrade {0}".format(path),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.upgrade(path)
 except pysvn.ClientError as e:
 @param project reference to the project object
 @return the project helper object
 """
 helper = self.__plugin.getProjectHelper()
 helper.setObjects(self, project)
-self.__wcng = \
+self.__wcng = (
 os.path.exists(
-os.path.join(project.getProjectPath(), ".svn", "format")) or \
+os.path.join(project.getProjectPath(), ".svn", "format")) or
 os.path.exists(
-os.path.join(project.getProjectPath(), "_svn", "format")) or \
+os.path.join(project.getProjectPath(), "_svn", "format")) or
 os.path.exists(
-os.path.join(project.getProjectPath(), ".svn", "wc.db")) or \
+os.path.join(project.getProjectPath(), ".svn", "wc.db")) or
 os.path.exists(
 os.path.join(project.getProjectPath(), "_svn", "wc.db"))
+)
 return helper
 ###########################################################################
 ##  Status Monitor Thread methods
 ###########################################################################

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py