Mercurial > public > mercurial-scm > hg-stable

diff mercurial/patch.py @ 49032:fd5b8e696b75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: stop using util.iterfile() The Python 3 implementation is a no-op. So this is equivalent. We still keep util.iterfile() around for backwards API compatibility to help the Python 3 migration. It can be deleted in a future release. Differential Revision: https://phab.mercurial-scm.org/D12347
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 21 Feb 2022 12:42:48 -0700
parents 2cce2fa5bcf7
children 642e31cb55f0
line wrap: on
line diff
--- a/mercurial/patch.py	Thu Mar 03 07:56:47 2022 -0800
+++ b/mercurial/patch.py	Mon Feb 21 12:42:48 2022 -0700
@@ -1259,7 +1259,7 @@
                     # Remove comment lines
                     patchfp = open(patchfn, 'rb')
                     ncpatchfp = stringio()
-                    for line in util.iterfile(patchfp):
+                    for line in patchfp:
                         line = util.fromnativeeol(line)
                         if not line.startswith(b'#'):
                             ncpatchfp.write(line)
@@ -2343,7 +2343,7 @@
     ui.debug(b'Using external patch tool: %s\n' % cmd)
     fp = procutil.popen(cmd, b'rb')
     try:
-        for line in util.iterfile(fp):
+        for line in fp:
             line = line.rstrip()
             ui.note(line + b'\n')
             if line.startswith(b'patching file '):