##// END OF EJS Templates
grep: avoid infinite loop when trailing newline is missing
Matt Mackall -
r7230:261a9f47 default
parent child Browse files
Show More
@@ -1094,9 +1094,9 b' def grep(ui, repo, pattern, *pats, **opt'
1094 mstart, mend = match.span()
1094 mstart, mend = match.span()
1095 linenum += body.count('\n', begin, mstart) + 1
1095 linenum += body.count('\n', begin, mstart) + 1
1096 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1096 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1097 lend = body.find('\n', mend)
1097 begin = body.find('\n', mend) + 1 or len(body)
1098 lend = begin - 1
1098 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1099 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1099 begin = lend + 1
1100
1100
1101 class linestate(object):
1101 class linestate(object):
1102 def __init__(self, line, linenum, colstart, colend):
1102 def __init__(self, line, linenum, colstart, colend):
General Comments 0
You need to be logged in to leave comments. Login now