From 45e8402f31ab34087c91ede2387d1dc6c808ca91 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Sat, 10 Feb 2018 17:49:41 -0800 Subject: [PATCH] Show merged parents if outdated If a change's parent is outdated, show it even if the parent is merged. Change-Id: Ifee3980d1f8ca83a88d5c433e790e786815a083f --- gertty/view/change.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gertty/view/change.py b/gertty/view/change.py index e8f17e8..d9e464d 100644 --- a/gertty/view/change.py +++ b/gertty/view/change.py @@ -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:')