Fixed an issue in the various diff dialogs writing the patch (this time properly).

Wed, 07 Sep 2011 18:08:56 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 07 Sep 2011 18:08:56 +0200
changeset 1300
9083f6b7ea3b
parent 1299
fd5d21389d2b
child 1302
95538c8d07c1

Fixed an issue in the various diff dialogs writing the patch (this time properly).

Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Tue Sep 06 19:47:39 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Wed Sep 07 18:08:56 2011 +0200
@@ -342,7 +342,7 @@
         
         eol = e5App().getObject("Project").getEolString()
         try:
-            f = open(fname, "w", encoding="utf-8")
+            f = open(fname, "w", encoding="utf-8", newline="")
             f.write(eol.join(self.contents.toPlainText().splitlines()))
             f.close()
         except IOError as why:
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Tue Sep 06 19:47:39 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Wed Sep 07 18:08:56 2011 +0200
@@ -343,7 +343,7 @@
         
         eol = e5App().getObject("Project").getEolString()
         try:
-            f = open(fname, "w", encoding="utf-8")
+            f = open(fname, "w", encoding="utf-8", newline="")
             f.write(eol.join(self.contents.toPlainText().splitlines()))
             f.close()
         except IOError as why:
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Tue Sep 06 19:47:39 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Wed Sep 07 18:08:56 2011 +0200
@@ -302,7 +302,7 @@
         
         eol = e5App().getObject("Project").getEolString()
         try:
-            f = open(fname, "w", encoding="utf-8")
+            f = open(fname, "w", encoding="utf-8", newline="")
             f.write(eol.join(self.contents.toPlainText().splitlines()))
             f.close()
         except IOError as why:

eric ide

mercurial