diff -r 10516539f238 -r 0a02c433f52d Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Fri Oct 18 23:00:41 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Fri Nov 01 15:48:48 2013 +0100
@@ -160,7 +160,8 @@
elif os.path.exists('/tmp'):
tmpdir = '/tmp'
else:
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8("Subversion Diff"),
self.trUtf8("""There is no temporary directory available."""))
return
@@ -220,7 +221,8 @@
diff_sum['path']))
diffText = os.linesep.join(diff_list)
else:
- diffText = self.client.diff(tmpdir,
+ diffText = self.client.diff(
+ tmpdir,
url1, revision1=rev1,
url_or_path2=url2, revision2=rev2,
recurse=recurse)
@@ -232,7 +234,8 @@
revision_start=rev1, revision_end=rev2,
recurse=recurse)
else:
- diffText = self.client.diff(tmpdir, name,
+ diffText = self.client.diff(
+ tmpdir, name,
revision1=rev1, revision2=rev2, recurse=recurse)
counter = 0
for line in diffText.splitlines():
@@ -421,7 +424,8 @@
if ex:
fname += ex
if QFileInfo(fname).exists():
- res = E5MessageBox.yesNo(self,
+ res = E5MessageBox.yesNo(
+ self,
self.trUtf8("Save Diff"),
self.trUtf8("<p>The patch file <b>{0}</b> already exists."
" Overwrite it?</p>").format(fname),
@@ -436,8 +440,10 @@
f.write(eol.join(self.contents.toPlainText().splitlines()))
f.close()
except IOError as why:
- E5MessageBox.critical(self, self.trUtf8('Save Diff'),
- self.trUtf8('<p>The patch file <b>{0}</b> could not be saved.'
+ E5MessageBox.critical(
+ self, self.trUtf8('Save Diff'),
+ self.trUtf8(
+ '<p>The patch file <b>{0}</b> could not be saved.'
'<br>Reason: {1}</p>')
.format(fname, str(why)))
