ttygroup/boartty
Code Issues Proposed changes

Fix handling no newline at EOF in both files

Browse Source 
If both files have no newline at EOF, diff will notify us in the
context, but that case wasn't handled by the parser.

https://storyboard.openstack.org/#!/story/84

Change-Id: Ib2f1b4b4c9d8f38a983300e7026331754592705f
This commit is contained in:
James E. Blair 2014-05-16 16:29:13 -04:00
parent 7f953ac970
commit e5666d006b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gertty/gitrepo.py
View File

@ -293,12 +293,16 @@ class Repo(object):
rest = line[1:]
if key == '\\':
# This is for "\ No newline at end of file" which
# follows either a - or + line to indicate which
# file it's talking about. For now, treat it like
# normal text and let the user infer from context
# that it's not actually in the file. Potential
# TODO: highlight it to make that more clear.
key = prev_key
# follows either a -, + or ' ' line to indicate
# which file it's talking about (or both). For
# now, treat it like normal text and let the user
# infer from context that it's not actually in the
# file. Potential TODO: highlight it to make that
# more clear.
if prev_key:
key = prev_key
else:
key = ' '
prev_key = '\\'
if key == '-':
prev_key = '-'