ttygroup/gertty
Code Issues Proposed changes

Fix change view display of inline comments in python3

Browse Source 
File comments were causing an exception when displayed on the
change view because python3 does not allow comparing None to int,
and file comments have a line number of None.

To correct this, use 0 as the line number for file comments whin
sorting and displaying them in the change view; there is no line
0 so this minor aliasing shouldn't cause any collisions.

Also, add a newline to the end of file comments, just as regular
inline comments (otherwise if a file comment was followed by a
line comment, they would appear on the same line).

Change-Id: Iedf88cdfd83adbc405e26cb013c9f57481d50c90
This commit is contained in:
James E. Blair 2019-03-28 07:57:41 -07:00
parent cd2538e04a
commit 0e770f0df6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gertty/view/change.py
View File

@ -455,7 +455,7 @@ class ChangeMessageBox(mywid.HyperText):
for comment in comments:
path = comment.file.path
inline_comments.setdefault(path, [])
inline_comments[path].append((comment.line, comment.message))
inline_comments[path].append((comment.line or 0, comment.message))
for v in inline_comments.values():
v.sort()
@ -464,8 +464,8 @@ class ChangeMessageBox(mywid.HyperText):
for key, value in inline_comments.items():
comment_text.append(('filename-inline-comment', u'%s' % key))
for line, comment in value:
if line is None:
comment_text.append(u'\n %s' % comment)
if not line:
comment_text.append(u'\n %s\n' % comment)
else:
comment_text.append(u'\n %s: %s\n' % (line, comment))