comparison mercurial/context.py @ 36715:b529e640015d

merge with stable
author Augie Fackler <augie@google.com>
date Sun, 04 Mar 2018 10:42:51 -0500
parents 334da951a50b 0a7c59a4c835
children 470df8c5b781
comparison
equal deleted inserted replaced
36714:2a258985ffeb 36715:b529e640015d
1077 needed[p] -= 1 1077 needed[p] -= 1
1078 1078
1079 hist[f] = curr 1079 hist[f] = curr
1080 del pcache[f] 1080 del pcache[f]
1081 1081
1082 return pycompat.ziplist(hist[base][0], hist[base][1].splitlines(True)) 1082 lineattrs, text = hist[base]
1083 return pycompat.ziplist(lineattrs, mdiff.splitnewlines(text))
1083 1084
1084 def ancestors(self, followfirst=False): 1085 def ancestors(self, followfirst=False):
1085 visit = {} 1086 visit = {}
1086 c = self 1087 c = self
1087 if followfirst: 1088 if followfirst: