diff -r 10516539f238 -r 0a02c433f52d Plugins/VcsPlugins/vcsPySvn/subversion.py
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Fri Oct 18 23:00:41 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Fri Nov 01 15:48:48 2013 +0100
@@ -199,7 +199,8 @@
"""
success = self.vcsImport(vcsDataDict, project.ppath)[0]
if not success:
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Create project in repository"),
self.trUtf8(
"""The project could not be created in the repository."""
@@ -222,7 +223,8 @@
if not os.path.isfile(pfn):
pfn += "z"
if not os.path.isfile(pfn):
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("New project"),
self.trUtf8(
"""The project could not be checked out of the"""
@@ -349,7 +351,8 @@
type_, ok = QInputDialog.getItem(
None,
self.trUtf8("Subversion Checkout"),
- self.trUtf8("The tag must be a normal tag (tags) or"
+ self.trUtf8(
+ "The tag must be a normal tag (tags) or"
" a branch tag (branches)."
" Please select from the list."),
self.tagTypeList,
@@ -413,7 +416,8 @@
type_, ok = QInputDialog.getItem(
None,
self.trUtf8("Subversion Export"),
- self.trUtf8("The tag must be a normal tag (tags) or"
+ self.trUtf8(
+ "The tag must be a normal tag (tags) or"
" a branch tag (branches)."
" Please select from the list."),
self.tagTypeList,
@@ -509,7 +513,8 @@
break
if not ok:
- res = E5MessageBox.yesNo(self.__ui,
+ res = E5MessageBox.yesNo(
+ self.__ui,
self.trUtf8("Commit Changes"),
self.trUtf8(
"""The commit affects files, that have unsaved"""
@@ -577,8 +582,8 @@
dlg.showError(e.args[0])
locker.unlock()
if not noDialog:
- rev and dlg.showMessage(self.trUtf8("Committed revision {0}.")\
- .format(rev.number))
+ rev and dlg.showMessage(self.trUtf8("Committed revision {0}.")
+ .format(rev.number))
dlg.finish()
dlg.exec_()
os.chdir(cwd)
@@ -1035,7 +1040,8 @@
reposURL = self.svnGetReposName(dname)
if reposURL is None:
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Subversion Error"),
self.trUtf8(
"""The URL of the project repository could not be"""
@@ -1061,9 +1067,11 @@
if self.otherData["standardLayout"]:
rx_base = QRegExp('(.+)/(trunk|tags|branches).*')
if not rx_base.exactMatch(reposURL):
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Subversion Error"),
- self.trUtf8("""The URL of the project repository has an"""
+ self.trUtf8(
+ """The URL of the project repository has an"""
""" invalid format. The tag operation will"""
""" be aborted"""))
return
@@ -1130,7 +1138,8 @@
if names[0]:
from UI.DeleteFilesConfirmationDialog import \
DeleteFilesConfirmationDialog
- dia = DeleteFilesConfirmationDialog(self.parent(),
+ dia = DeleteFilesConfirmationDialog(
+ self.parent(),
self.trUtf8("Revert changes"),
self.trUtf8(
"Do you really want to revert all changes to these files"
@@ -1138,7 +1147,8 @@
name)
yes = dia.exec_() == QDialog.Accepted
else:
- yes = E5MessageBox.yesNo(None,
+ yes = E5MessageBox.yesNo(
+ None,
self.trUtf8("Revert changes"),
self.trUtf8("""Do you really want to revert all changes of"""
""" the project?"""))
@@ -1173,7 +1183,8 @@
reposURL = self.svnGetReposName(dname)
if reposURL is None:
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Subversion Error"),
self.trUtf8(
"""The URL of the project repository could not be"""
@@ -1199,9 +1210,11 @@
if self.otherData["standardLayout"]:
rx_base = QRegExp('(.+)/(trunk|tags|branches).*')
if not rx_base.exactMatch(reposURL):
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Subversion Error"),
- self.trUtf8("""The URL of the project repository has an"""
+ self.trUtf8(
+ """The URL of the project repository has an"""
""" invalid format. The switch operation will"""
""" be aborted"""))
return False
@@ -1221,10 +1234,9 @@
tn = url
client = self.getClient()
- dlg = \
- SvnDialog(self.trUtf8('Switching to {0}').format(tn),
- "switch {0} {1}".format(url, name),
- client)
+ dlg = SvnDialog(self.trUtf8('Switching to {0}').format(tn),
+ "switch {0} {1}".format(url, name),
+ client)
QApplication.processEvents()
locker = QMutexLocker(self.vcsExecutionMutex)
try:
@@ -1605,10 +1617,9 @@
@param name directory name to be cleaned up (string)
"""
client = self.getClient()
- dlg = \
- SvnDialog(self.trUtf8('Cleaning up {0}').format(name),
- "cleanup {0}".format(name),
- client)
+ dlg = SvnDialog(self.trUtf8('Cleaning up {0}').format(name),
+ "cleanup {0}".format(name),
+ client)
QApplication.processEvents()
locker = QMutexLocker(self.vcsExecutionMutex)
try:
@@ -1694,7 +1705,8 @@
pysvn.svn_api_version[3])
else:
apiVersion = QApplication.translate('subversion', "unknown")
- return QApplication.translate('subversion',
+ return QApplication.translate(
+ 'subversion',
"""<h3>Repository information</h3>"""
"""<table>"""
"""<tr><td><b>PySvn V.</b></td><td>{0}</td></tr>"""
@@ -1761,12 +1773,11 @@
opts = self.options['global']
recurse = "--non-recursive" not in opts
client = self.getClient()
- dlg = \
- SvnDialog(self.trUtf8('Resolving conficts'),
- "resolved{0} {1}".format(
- (not recurse) and " --non-recursive" or "",
- " ".join(fnames)),
- client)
+ dlg = SvnDialog(self.trUtf8('Resolving conficts'),
+ "resolved{0} {1}".format(
+ (not recurse) and " --non-recursive" or "",
+ " ".join(fnames)),
+ client)
QApplication.processEvents()
try:
for name in fnames:
@@ -1853,7 +1864,8 @@
if dlg.exec_() == QDialog.Accepted:
propName, propValue, recurse = dlg.getData()
if not propName:
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Subversion Set Property"),
self.trUtf8(
"""You have to supply a property name. Aborting."""))
@@ -1906,7 +1918,8 @@
propName, recurse = dlg.getData()
if not propName:
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Subversion Delete Property"),
self.trUtf8(
"""You have to supply a property name. Aborting."""))
@@ -2134,7 +2147,8 @@
output1, error = self.__svnGetFileForRevision(name, rev=rev1)
if error:
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Subversion Side-by-Side Difference"),
error)
return
@@ -2143,7 +2157,8 @@
if rev2:
output2, error = self.__svnGetFileForRevision(name, rev=rev2)
if error:
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Subversion Side-by-Side Difference"),
error)
return
@@ -2155,7 +2170,8 @@
f1.close()
name2 = name
except IOError:
- E5MessageBox.critical(self.__ui,
+ E5MessageBox.critical(
+ self.__ui,
self.trUtf8("Subversion Side-by-Side Difference"),
self.trUtf8(
"""<p>The file <b>{0}</b> could not be read.</p>""")
