From e880e2c82494613b15ae0d01837d6b0017120cc7 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 22 Aug 2017 16:27:15 -0400 Subject: [PATCH] show missing changes before included changes Show the report of any changes that have been missed because the author picked a bad SHA before the list of changes that will be in the release. Change-Id: I8435f037033c7d8ff8150d2b7f215e0cd56b62a4 Signed-off-by: Doug Hellmann --- openstack_releases/cmds/list_changes.py | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/openstack_releases/cmds/list_changes.py b/openstack_releases/cmds/list_changes.py index b89d07a73b..4996c74511 100644 --- a/openstack_releases/cmds/list_changes.py +++ b/openstack_releases/cmds/list_changes.py @@ -403,19 +403,6 @@ def main(): git_diff(workdir, project['repo'], git_range, '*requirements*.txt') git_diff(workdir, project['repo'], git_range, 'setup.cfg') - # Show the changes since the last release, first as a - # graph view so we can check for bad merges, and then with - # more detail. - git_log(workdir, project['repo'], - 'Release %s will include' % new_release['version'], - git_range, - extra_args=['--graph', '--oneline', '--decorate', - '--topo-order']) - git_log(workdir, project['repo'], - 'Details Contents', - git_range, - extra_args=['--no-merges', '--topo-order']) - # Show any changes in the previous release but not in this # release, in case someone picks an "early" SHA or a # regular commit instead of the appropriate merge commit. @@ -467,4 +454,17 @@ def main(): else: print('SHA NOT FOUND in descendants') + # Show the changes since the last release, first as a + # graph view so we can check for bad merges, and then with + # more detail. + git_log(workdir, project['repo'], + 'Release %s will include' % new_release['version'], + git_range, + extra_args=['--graph', '--oneline', '--decorate', + '--topo-order']) + git_log(workdir, project['repo'], + 'Details Contents', + git_range, + extra_args=['--no-merges', '--topo-order']) + return 0