grim/hgwebplus

Always return the actual line number in _prettyprintdifflines.

2020-05-04, Gary Kramlich
c41e09d95cd6
Parents adfec69a1368
Children 5c421416c11b
Always return the actual line number in _prettyprintdifflines.
1 files changed, 4 insertions(+), 13 deletions(-)
  • +4 -13
    src/hgwebplus.py
    • --- a/src/hgwebplus.py Mon May 04 23:40:07 2020 -0500
    +++ b/src/hgwebplus.py Mon May 04 23:41:08 2020 -0500
    @@ -110,40 +110,31 @@
    seenb = False
    for lineno, l in enumerate(lines, 1):
    - showa = True
    - showb = True
    -
    match = RE_DIFF.match(l.decode('ascii'))
    if match is not None:
    ltype = b'difflineat'
    groups = match.groups()
    linea = int(groups[0])
    lineb = int(groups[1])
    - showa = False
    - showb = False
    seena = False
    seenb = False
    elif l.startswith(b'---'):
    ltype = b'difflineminus'
    - showa = False
    - showb = False
    + linea = 0
    elif l.startswith(b'+++'):
    ltype = b'difflineplus'
    - showa = False
    - showb = False
    + lineb = 0
    elif l.startswith(b'-'):
    # only increment if we've already seen a minus line
    if seena:
    linea += 1
    ltype = b'difflineminus'
    - showb = False
    seena = True
    elif l.startswith(b'+'):
    # only increment if we've already seen a plus line
    if seenb:
    lineb += 1
    ltype = b'difflineplus'
    - showa = False
    seenb = True
    else:
    # only increment if we've already seen a plus/minus line
    @@ -162,8 +153,8 @@
    b'filea': filea,
    b'fileb': fileb,
    b'line': l,
    - b'linea': showa and linea or b'',
    - b'lineb': showb and lineb or b'',
    + b'linea': linea,
    + b'lineb': lineb,
    b'lineid': lineidprefix + b"l%s" % difflineno,
    b'lineno': lineno,
    b'linenumber': b"% 8s" % difflineno,