ttygroup
/
boartty
Code Issues Proposed changes

Merge "Make unified diffs group changed lines"

This commit is contained in:
Jenkins 2016-07-26 17:23:34 +00:00 committed by Gerrit Code Review
parent f4315cbb34 d0cc41b49c
commit b0f6a550b6
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gertty/view/unified_diff.py
View File

@ -125,47 +125,73 @@ class UnifiedFileReminder(BaseFileReminder):
class UnifiedDiffView(BaseDiffView): class UnifiedDiffView(BaseDiffView):
def makeLines(self, diff, lines_to_add, comment_lists): def makeLines(self, diff, lines_to_add, comment_lists):
lines = [] lines = []
old_cache = []
new_cache = []
for old, new in lines_to_add: for old, new in lines_to_add:
context = self.makeContext(diff, old[0], new[0]) context = self.makeContext(diff, old[0], new[0])
if context.old_ln is not None: if context.old_ln is not None:
lines.append(UnifiedDiffLine(self.app, context, gitrepo.OLD, old, new, old_cache.append(UnifiedDiffLine(self.app, context, gitrepo.OLD, old, new,
callback=self.onSelect)) callback=self.onSelect))
else:
lines.extend(old_cache)
lines.extend(new_cache)
old_cache = []
new_cache = []
# see if there are any comments for this line # see if there are any comments for this line
key = 'old-%s-%s' % (old[0], diff.oldname) key = 'old-%s-%s' % (old[0], diff.oldname)
old_list = comment_lists.pop(key, []) old_list = comment_lists.pop(key, [])
while old_list: while old_list:
(old_comment_key, old_comment) = old_list.pop(0) (old_comment_key, old_comment) = old_list.pop(0)
lines.append(UnifiedDiffComment(context, gitrepo.OLD, old_comment)) old_cache.append(UnifiedDiffComment(context, gitrepo.OLD, old_comment))
# see if there are any draft comments for this line # see if there are any draft comments for this line
key = 'olddraft-%s-%s' % (old[0], diff.oldname) key = 'olddraft-%s-%s' % (old[0], diff.oldname)
old_list = comment_lists.pop(key, []) old_list = comment_lists.pop(key, [])
while old_list: while old_list:
(old_comment_key, old_comment) = old_list.pop(0) (old_comment_key, old_comment) = old_list.pop(0)
lines.append(UnifiedDiffCommentEdit(self.app, old_cache.append(UnifiedDiffCommentEdit(self.app,
context, context,
gitrepo.OLD, gitrepo.OLD,
old_comment_key, old_comment_key,
old_comment)) old_comment))
# new line # new line
if context.new_ln is not None and new[1] != ' ': if context.new_ln is not None and new[1] != ' ':
lines.append(UnifiedDiffLine(self.app, context, gitrepo.NEW, old, new, if old_cache:
callback=self.onSelect)) new_cache.append(UnifiedDiffLine(self.app, context, gitrepo.NEW, old, new,
callback=self.onSelect))
else:
lines.append(UnifiedDiffLine(self.app, context, gitrepo.NEW, old, new,
callback=self.onSelect))
# see if there are any comments for this line # see if there are any comments for this line
key = 'new-%s-%s' % (new[0], diff.newname) key = 'new-%s-%s' % (new[0], diff.newname)
new_list = comment_lists.pop(key, []) new_list = comment_lists.pop(key, [])
while new_list: while new_list:
(new_comment_key, new_comment) = new_list.pop(0) (new_comment_key, new_comment) = new_list.pop(0)
lines.append(UnifiedDiffComment(context, gitrepo.NEW, new_comment)) if old_cache:
new_cache.append(UnifiedDiffComment(context, gitrepo.NEW, new_comment))
else:
lines.append(UnifiedDiffComment(context, gitrepo.NEW, new_comment))
# see if there are any draft comments for this line # see if there are any draft comments for this line
key = 'newdraft-%s-%s' % (new[0], diff.newname) key = 'newdraft-%s-%s' % (new[0], diff.newname)
new_list = comment_lists.pop(key, []) new_list = comment_lists.pop(key, [])
while new_list: while new_list:
(new_comment_key, new_comment) = new_list.pop(0) (new_comment_key, new_comment) = new_list.pop(0)
lines.append(UnifiedDiffCommentEdit(self.app, if old_cache:
context, new_cache.append(UnifiedDiffCommentEdit(self.app,
gitrepo.NEW, context,
new_comment_key, gitrepo.NEW,
new_comment)) new_comment_key,
new_comment))
else:
lines.append(UnifiedDiffCommentEdit(self.app,
context,
gitrepo.NEW,
new_comment_key,
new_comment))
else:
if old_cache:
lines.extend(old_cache)
if new_cache:
lines.extend(new_cache)
return lines return lines
def makeFileReminder(self): def makeFileReminder(self):