Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 36715:b529e640015d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Sun, 04 Mar 2018 10:42:51 -0500
parents 334da951a50b 0a7c59a4c835
children 470df8c5b781
line wrap: on
line diff
--- a/mercurial/context.py	Sat Mar 03 15:31:37 2018 -0800
+++ b/mercurial/context.py	Sun Mar 04 10:42:51 2018 -0500
@@ -1079,7 +1079,8 @@
                 hist[f] = curr
                 del pcache[f]
 
-        return pycompat.ziplist(hist[base][0], hist[base][1].splitlines(True))
+        lineattrs, text = hist[base]
+        return pycompat.ziplist(lineattrs, mdiff.splitnewlines(text))
 
     def ancestors(self, followfirst=False):
         visit = {}