Show merged parents if outdated

If a change's parent is outdated, show it even if the parent is
merged.

Change-Id: Ifee3980d1f8ca83a88d5c433e790e786815a083f
This commit is contained in:
James E. Blair 2018-02-10 17:49:41 -08:00
parent fd35b72acf
commit 45e8402f31
1 changed files with 5 additions and 2 deletions

View File

@ -839,13 +839,16 @@ class ChangeView(urwid.WidgetWrap):
# Handle depends-on
parents = {}
parent = session.getRevisionByCommit(revision.parent)
if parent and parent.change.status != 'MERGED':
if parent:
subject = parent.change.subject
show_merged = False
if parent != parent.change.revisions[-1]:
subject += ' [OUTDATED]'
show_merged = True
if parent.change.status == 'ABANDONED':
subject += ' [ABANDONED]'
parents[parent.change.key] = subject
if show_merged or parent.change.status != 'MERGED':
parents[parent.change.key] = subject
self._updateDependenciesWidget(parents,
self.depends_on, self.depends_on_rows,
header='Depends on:')