ttygroup
/
gertty
Code Issues Proposed changes

Merge "Fix handling no newline at EOF in both files"

This commit is contained in:
Jenkins 2014-05-27 14:44:39 +00:00 committed by Gerrit Code Review
parent 8578c0e527 e5666d006b
commit 374f0260c6
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 = '-'