Browse Source

Show merged parents if outdated

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

Change-Id: Ifee3980d1f8ca83a88d5c433e790e786815a083f
James E. Blair 1 year ago
parent
commit
45e8402f31
1 changed files with 5 additions and 2 deletions
  1. 5
    2
      gertty/view/change.py

+ 5
- 2
gertty/view/change.py View File

@@ -839,13 +839,16 @@ class ChangeView(urwid.WidgetWrap):
839 839
         # Handle depends-on
840 840
         parents = {}
841 841
         parent = session.getRevisionByCommit(revision.parent)
842
-        if parent and parent.change.status != 'MERGED':
842
+        if parent:
843 843
             subject = parent.change.subject
844
+            show_merged = False
844 845
             if parent != parent.change.revisions[-1]:
845 846
                 subject += ' [OUTDATED]'
847
+                show_merged = True
846 848
             if parent.change.status == 'ABANDONED':
847 849
                 subject += ' [ABANDONED]'
848
-            parents[parent.change.key] = subject
850
+            if show_merged or parent.change.status != 'MERGED':
851
+                parents[parent.change.key] = subject
849 852
         self._updateDependenciesWidget(parents,
850 853
                                        self.depends_on, self.depends_on_rows,
851 854
                                        header='Depends on:')

Loading…
Cancel
Save