Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the various diff dialogs writing the patch.
Tue, 06 Sep 2011 18:33:27 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 06 Sep 2011 18:33:27 +0200
- branch
- 5_1_x
- changeset 1298
- 090b37850a89
- parent 1296
- c4574e31bfc4
- child 1301
- a2b0aceba6a2
Fixed an issue in the various diff dialogs writing the patch.
(transplanted from 6347cf7820362bae009ddd787bbe11699fbf4328)
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Tue Sep 06 18:18:40 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Tue Sep 06 18:33:27 2011 +0200 @@ -14,6 +14,7 @@ QTextCursor, QLineEdit from E5Gui import E5MessageBox, E5FileDialog +from E5Gui.E5Application import e5App from .Ui_HgDiffDialog import Ui_HgDiffDialog @@ -289,9 +290,10 @@ return fname = Utilities.toNativeSeparators(fname) + eol = e5App().getObject("Project").getEolString() try: f = open(fname, "w", encoding = "utf-8") - f.write(self.contents.toPlainText()) + f.write(eol.join(self.contents.toPlainText().splitlines())) f.close() except IOError as why: E5MessageBox.critical(self, self.trUtf8('Save Diff'),
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Tue Sep 06 18:18:40 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Tue Sep 06 18:33:27 2011 +0200 @@ -339,9 +339,10 @@ return fname = Utilities.toNativeSeparators(fname) + eol = e5App().getObject("Project").getEolString() try: f = open(fname, "w", encoding = "utf-8") - f.write(self.contents.toPlainText()) + f.write(eol.join(self.contents.toPlainText().splitlines())) f.close() except IOError as why: E5MessageBox.critical(self, self.trUtf8('Save Diff'),
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Tue Sep 06 18:18:40 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Tue Sep 06 18:33:27 2011 +0200 @@ -299,9 +299,10 @@ return fname = Utilities.toNativeSeparators(fname) + eol = e5App().getObject("Project").getEolString() try: f = open(fname, "w", encoding = "utf-8") - f.write(self.contents.toPlainText()) + f.write(eol.join(self.contents.toPlainText().splitlines())) f.close() except IOError as why: E5MessageBox.critical(self, self.trUtf8('Save Diff'),
