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

-:799196d0b05d
+:12ebd3934fef
 from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
-from E5Utilities.E5MutexLocker import E5MutexLocker
+from EricUtilities.EricMutexLocker import EricMutexLocker
 from VCS.VersionControl import VersionControl
 import pysvn
 "import{0} --message {1} .".format(
 (not recurse) and " --non-recursive" or "", msg),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 rev = client.import_(".", url, msg, recurse, ignore=True)
 status = True
 except pysvn.ClientError as e:
 status = False
 rev = None
 (not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.checkout(url, projectDir, recurse)
 status = True
 except pysvn.ClientError as e:
 status = False
 if not noDialog:
 (not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.export(url, projectDir, force=True, recurse=recurse)
 status = True
 except pysvn.ClientError as e:
 status = False
 dlg.showError(e.args[0])
 " --changelist ".join([""] + changelists) or "",
 msg, " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 rev = (
 client.checkin(
 fnames, msg, recurse=recurse, keep_locks=keeplocks,
 keep_changelist=keepChangelists,
 changelists=changelists)
 (not recurse) and " --non-recursive" or "",
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.update(fnames, recurse)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 if not noDialog:
 dlg.finish()
 noignore and " --no-ignore" or "",
 " ".join(names)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.add(names, recurse=recurse, force=force,
 ignore=not noignore)
 except pysvn.ClientError as e:
 if not noDialog:
 dlg.showError(e.args[0])
 ignore and " --ignore" or "",
 " ".join(names)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.add(names, recurse=recurse, force=force, ignore=ignore)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 dlg.finish()
 dlg.exec()
 force and " --force" or "",
 " ".join(name)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.remove(name, force=force)
 res = True
 except pysvn.ClientError as e:
 res = False
 if not noDialog:
 log and (" --message {0}".format(log)) or "",
 name, target),
 client, log=log)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.move(name, target, force=force)
 res = True
 except pysvn.ClientError as e:
 res = False
 if not noDialog:
 .format(name),
 "copy --message {0} {1} {2}".format(log, reposURL, url),
 client, log=log)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 rev = client.copy(reposURL, url)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 else:
 log = 'Deleted tag <{0}>'.format(self.tagName)
 .format(name),
 "remove --message {0} {1}".format(log, url),
 client, log=log)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 rev = client.remove(url)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 rev and dlg.showMessage(
 self.tr("Revision {0}.\n").format(rev.number))
 (not recurse) and " --non-recursive" or "",
 " ".join(name)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.revert(name, recurse)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 dlg.finish()
 dlg.exec()
 dlg = SvnDialog(self.tr('Switching to {0}').format(tn),
 "switch {0} {1}".format(url, name),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 rev = client.switch(name, url)
 dlg.showMessage(self.tr("Revision {0}.\n").format(rev.number))
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 dlg.finish()
 "{0}{1}".format(url2, rev2 and ("@" + rev2) or ""),
 fname),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.merge(url1, revision1, url2, revision2, fname,
 recurse=recurse, force=force)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 dlg.finish()
 client.callback_ssl_server_trust_prompt = (
 mixin._clientSslServerTrustPromptCallback
 )
 with contextlib.suppress(pysvn.ClientError):
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(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:
 name = os.path.normcase(file.path)
 client.callback_ssl_server_trust_prompt = (
 mixin._clientSslServerTrustPromptCallback
 )
 with contextlib.suppress(pysvn.ClientError):
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(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 self.__isVersioned(file):
 dlg = SvnDialog(self.tr('Cleaning up {0}').format(name),
 "cleanup {0}".format(name),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.cleanup(name)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 dlg.finish()
 dlg.exec()
 @param path local path to get the svn repository path for (string)
 @return string with the repository path URL
 """
 client = pysvn.Client()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 entry = client.info(path)
 url = entry.url
 except pysvn.ClientError:
 url = ""
 return url
 (not recurse) and " --non-recursive" or "",
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 for name in fnames:
 client.resolved(name, recurse=recurse)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 dlg.finish()
 log and (" --message {0}".format(log)) or "",
 name, target),
 client, log=log)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.copy(name, target)
 res = True
 except pysvn.ClientError as e:
 res = False
 dlg.showError(e.args[0])
 propName, propValue,
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 for name in fnames:
 client.propset(propName, propValue, name,
 recurse=recurse, skip_checks=skipchecks)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 skipchecks and " --skip-checks" or "",
 propName, " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 for name in fnames:
 client.propdel(propName, name,
 recurse=recurse, skip_checks=skipchecks)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 comment and (" --message {0}".format(comment)) or "",
 " ".join(fnames)),
 client, parent=parent)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.lock(fnames, comment, force=stealIt)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 except AttributeError as e:
 dlg.showError(str(e))
 "unlock{0} {1}".format(breakIt and " --force" or "",
 " ".join(fnames)),
 client, parent=parent)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.unlock(fnames, force=breakIt)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 except AttributeError as e:
 dlg.showError(str(e))
 projectPath)
 client = self.getClient()
 dlg = SvnDialog(self.tr('Relocating'), msg, client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 if inside:
 client.switch(projectPath, newUrl)
 else:
 client.relocate(currUrl, newUrl, projectPath,
 recurse=True)
 self.tr('Remove from changelist'),
 "changelist --remove {0}".format(" ".join(names)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 for name in names:
 client.remove_from_changelists(name)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 dlg.finish()
 self.tr('Add to changelist'),
 "changelist {0}".format(" ".join(names)),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 for name in names:
 client.add_to_changelist(
 name, clname, depth=pysvn.depth.infinity)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 changelists = []
 client = self.getClient()
 if hasattr(client, 'get_changelist'):
 ppath = e5App().getObject("Project").getProjectPath()
 with contextlib.suppress(pysvn.ClientError):
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 entries = client.get_changelist(
 ppath, depth=pysvn.depth.infinity)
 for entry in entries:
 changelist = entry[1]
 if changelist not in changelists:
 self.tr('Upgrade'),
 "upgrade {0}".format(path),
 client)
 QApplication.processEvents()
 try:
-with E5MutexLocker(self.vcsExecutionMutex):
+with EricMutexLocker(self.vcsExecutionMutex):
 client.upgrade(path)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 dlg.finish()
 dlg.exec()

Mercurial Repositories > eric / file comparison

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

eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py