From e5666d006bc5668642d171715abbc2054291b4a2 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 16 May 2014 16:29:13 -0400 Subject: [PATCH] Fix handling no newline at EOF in both files 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 --- gertty/gitrepo.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gertty/gitrepo.py b/gertty/gitrepo.py index 02e022a..44eb829 100644 --- a/gertty/gitrepo.py +++ b/gertty/gitrepo.py @@ -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 = '-'