Mercurial > public > mercurial-scm > hg-stable

diff mercurial/patch.py @ 34260:5ce32fe7df34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix doctests in patch.py to be compatible with Python 3 We were lucky that parsepatch() could concatenate a character slice as if it were a list of chunks.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 17 Sep 2017 12:23:16 +0900
parents c43d055ae405
children 86f3c9760cc4
line wrap: on
line diff
--- a/mercurial/patch.py	Sun Sep 17 12:20:35 2017 +0900
+++ b/mercurial/patch.py	Sun Sep 17 12:23:16 2017 +0900
@@ -1490,7 +1490,7 @@
     ...  5
     ...  d
     ... +lastline"""
-    >>> hunks = parsepatch(rawpatch)
+    >>> hunks = parsepatch([rawpatch])
     >>> hunkscomingfromfilterpatch = []
     >>> for h in hunks:
     ...     hunkscomingfromfilterpatch.append(h)
@@ -1501,7 +1501,7 @@
     >>> fp = util.stringio()
     >>> for c in reversedhunks:
     ...      c.write(fp)
-    >>> fp.seek(0)
+    >>> fp.seek(0) or None
     >>> reversedpatch = fp.read()
     >>> print(pycompat.sysstr(reversedpatch))
     diff --git a/folder1/g b/folder1/g