--- a/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat May 22 12:54:57 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat May 22 16:52:45 2021 +0200
@@ -20,7 +20,7 @@
from E5Gui.E5Application import e5App
from E5Gui import E5MessageBox
-from E5Utilities.E5MutexLocker import E5MutexLocker
+from EricUtilities.EricMutexLocker import EricMutexLocker
from VCS.VersionControl import VersionControl
@@ -316,7 +316,7 @@
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:
@@ -392,7 +392,7 @@
client)
QApplication.processEvents()
try:
- with E5MutexLocker(self.vcsExecutionMutex):
+ with EricMutexLocker(self.vcsExecutionMutex):
client.checkout(url, projectDir, recurse)
status = True
except pysvn.ClientError as e:
@@ -457,7 +457,7 @@
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:
@@ -584,7 +584,7 @@
client)
QApplication.processEvents()
try:
- with E5MutexLocker(self.vcsExecutionMutex):
+ with EricMutexLocker(self.vcsExecutionMutex):
rev = (
client.checkin(
fnames, msg, recurse=recurse, keep_locks=keeplocks,
@@ -638,7 +638,7 @@
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])
@@ -750,7 +750,7 @@
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:
@@ -858,7 +858,7 @@
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])
@@ -895,7 +895,7 @@
client)
QApplication.processEvents()
try:
- with E5MutexLocker(self.vcsExecutionMutex):
+ with EricMutexLocker(self.vcsExecutionMutex):
client.remove(name, force=force)
res = True
except pysvn.ClientError as e:
@@ -957,7 +957,7 @@
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:
@@ -1096,7 +1096,7 @@
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])
@@ -1109,7 +1109,7 @@
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])
@@ -1160,7 +1160,7 @@
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])
@@ -1237,7 +1237,7 @@
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:
@@ -1343,7 +1343,7 @@
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:
@@ -1484,7 +1484,7 @@
)
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)]
@@ -1561,7 +1561,7 @@
)
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:
@@ -1635,7 +1635,7 @@
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])
@@ -1762,7 +1762,7 @@
"""
client = pysvn.Client()
try:
- with E5MutexLocker(self.vcsExecutionMutex):
+ with EricMutexLocker(self.vcsExecutionMutex):
entry = client.info(path)
url = entry.url
except pysvn.ClientError:
@@ -1793,7 +1793,7 @@
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:
@@ -1833,7 +1833,7 @@
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:
@@ -1907,7 +1907,7 @@
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)
@@ -1958,7 +1958,7 @@
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)
@@ -2257,7 +2257,7 @@
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])
@@ -2293,7 +2293,7 @@
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])
@@ -2335,7 +2335,7 @@
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:
@@ -2387,7 +2387,7 @@
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:
@@ -2423,7 +2423,7 @@
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)
@@ -2455,7 +2455,7 @@
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:
@@ -2478,7 +2478,7 @@
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])
