Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: open patch file in binary mode and convert eol manually
authorYuya Nishihara <yuya@tcha.org>
Sat, 10 Mar 2018 19:49:09 +0900
changeset 36838 c268ba15deb3
parent 36837 472c68cda3f8
child 36839 5b9ae9eca94a
py3: open patch file in binary mode and convert eol manually Here we don't introduce a reader wrapper since it wouldn't be easy to make read(n) handle partial data and length correctly.
mercurial/patch.py file | annotate | diff | comparison | revisions 
--- a/mercurial/patch.py	Tue Mar 06 07:45:57 2018 -0600
+++ b/mercurial/patch.py	Sat Mar 10 19:49:09 2018 +0900
@@ -1120,9 +1120,10 @@
                         ui.warn(_("editor exited with exit code %d\n") % ret)
                         continue
                     # Remove comment lines
-                    patchfp = open(patchfn)
+                    patchfp = open(patchfn, r'rb')
                     ncpatchfp = stringio()
                     for line in util.iterfile(patchfp):
+                        line = util.fromnativeeol(line)
                         if not line.startswith('#'):
                             ncpatchfp.write(line)
                     patchfp.close()
Mercurial