openstack/releases
Code Issues Proposed changes

Merge "show missing changes before included changes"

Browse Source
This commit is contained in:
Jenkins 2017-08-28 09:55:54 +00:00 committed by Gerrit Code Review
commit 9f4a31a7ba
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openstack_releases/cmds/list_changes.py
View File

@ -430,19 +430,6 @@ def main():
git_diff(workdir, project['repo'], git_range, '*requirements*.txt') git_diff(workdir, project['repo'], git_range, '*requirements*.txt')
git_diff(workdir, project['repo'], git_range, 'setup.cfg') 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 # Show any changes in the previous release but not in this
# release, in case someone picks an "early" SHA or a # release, in case someone picks an "early" SHA or a
# regular commit instead of the appropriate merge commit. # regular commit instead of the appropriate merge commit.
@ -494,4 +481,17 @@ def main():
else: else:
print('SHA NOT FOUND in descendants') 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 return 0