kallithea Changeset - 3ab8744d20c9

Changeset - 3ab8744d20c9

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich (mads) - 5 years ago 2021-02-22 10:56:04
mads@kiilerich.com

Grafted from: b3ba43b8c749

diffs: drop pointless check for "\ No newline at end of file"

Such lines would have been caught on '\' as "unknown command" by the command
check a few lines above.

1 file changed with 8 insertions and 9 deletions:

kallithea/lib/diffs.py

0 comments (0 inline, 0 general)

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -643,57 +643,56 @@ def _parse_lines(diff_lines): @@
             line = next(diff_lines)
             while old_line < old_end or new_line < new_end:
                 if not line:
                     raise Exception('error parsing diff - empty line at -%s+%s' % (old_line, new_line))
                 affects_old = affects_new = False
                 command = line[0]
                 if command == '+':
                     affects_new = True
                     action = 'add'
                     added += 1
                 elif command == '-':
                     affects_old = True
                     action = 'del'
                     deleted += 1
                 elif command == ' ':
                     affects_old = affects_new = True
                     action = 'unmod'
                 else:
                     raise Exception('error parsing diff - unknown command in line %r at -%s+%s' % (line, old_line, new_line))
                 if not _newline_marker.match(line):
                     old_line += affects_old
                     new_line += affects_new
                     lines.append({
                         'old_lineno':   affects_old and old_line or '',
                         'new_lineno':   affects_new and new_line or '',
                         'action':       action,
                         'line':         line[1:],
                     })
                 old_line += affects_old
                 new_line += affects_new
                 lines.append({
                     'old_lineno':   affects_old and old_line or '',
                     'new_lineno':   affects_new and new_line or '',
                     'action':       action,
                     'line':         line[1:],
                 })
                 line = next(diff_lines)
                 if _newline_marker.match(line):
                     # we need to append to lines, since this is not
                     # counted in the line specs of diff
                     lines.append({
                         'old_lineno':   '',
                         'new_lineno':   '',
                         'action':       'context',
                         'line':         line,
                     })
                     line = next(diff_lines)
             if old_line > old_end:
                 raise Exception('error parsing diff - more than %s "-" lines at -%s+%s' % (old_end, old_line, new_line))
             if new_line > new_end:
                 raise Exception('error parsing diff - more than %s "+" lines at -%s+%s' % (new_end, old_line, new_line))
     except StopIteration:
         pass
     if old_line != old_end or new_line != new_end:
         raise Exception('diff processing broken when old %s<>%s or new %s<>%s line %r' % (old_line, old_end, new_line, new_end, line))
     return chunks, added, deleted

0 comments (0 inline, 0 general)