From 49e87a2e3e48d3fad239c007f55d6000fedad410 Mon Sep 17 00:00:00 2001 From: Darragh Bailey Date: Wed, 18 Nov 2015 17:07:55 +0000 Subject: [PATCH] Update ChangeLog with missing releases Add previous releases to the ChangeLog using a customized version of gitchangelog available from: - https://github.com/electrofelix/gitchangelog.git Include configuration file with preferred options to simplify future generation. Change-Id: Ib09e2a7debd2bbb6306c2d5a95cdd90a12bdbb73 --- .gitchangelog.rc | 104 +++++++++++++++++++++ ChangeLog | 234 +++++++++++++++++++++++++++-------------------- 2 files changed, 241 insertions(+), 97 deletions(-) create mode 100644 .gitchangelog.rc diff --git a/.gitchangelog.rc b/.gitchangelog.rc new file mode 100644 index 0000000..fe920e7 --- /dev/null +++ b/.gitchangelog.rc @@ -0,0 +1,104 @@ +## gitchangelog.rc for git-upstream +## +## Refer to the reference config file for full explanation: +## https://github.com/vaab/gitchangelog/blob/master/gitchangelog.rc.reference + +## ``ignore_regexps`` is a line of regexps +## +## Any commit having its full commit message matching any regexp listed here +## will be ignored and won't be reported in the changelog. +## +ignore_regexps = [ + r'@minor', r'!minor', + r'@cosmetic', r'!cosmetic', + r'@refactor', r'!refactor', + r'@wip', r'!wip', + r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[p|P]kg:', + r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[d|D]ev:', + r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$', + ] + + +## ``section_regexps`` is a list of 2-tuples associating a string label and a +## list of regexp +## +## Commit messages will be classified in sections thanks to this. Section +## titles are the label, and a commit is classified under this section if any +## of the regexps associated is matching. +## +section_regexps = [ + ('New', [ + r'^[nN]ew\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$', + ]), + ('Changes', [ + r'^[cC]hg\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$', + ]), + ('Fix', [ + r'^[fF]ix\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$', + ]), + + ('Other', None ## Match all lines + ), + +] + + +## ``body_process`` is a callable +## +## This callable will be given the original body and result will +## be used in the changelog. +## +body_process = ReSub(r'.*', r'') | strip + +## ``subject_process`` is a callable +## +## This callable will be given the original subject and result will +## be used in the changelog. +## +subject_process = (strip | + ReSub(r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n@]*)(@[a-z]+\s+)*$', r'\4') | + ucfirst | final_dot) + + +## ``tag_filter_regexp`` is a regexp +## +## Tags that will be used for the changelog must match this regexp. +## +tag_filter_regexp = r'^[0-9]+\.[0-9]+(\.[0-9]+)?$' + + +## ``unreleased_version_label`` is a string +## +## This label will be used as the changelog Title of the last set of changes +## between last valid tag and HEAD if any. +## +unreleased_version_label = "%%version%% (unreleased)" + + +## ``output_engine`` is a callable +## +## This will change the output format of the generated changelog file +## +output_engine = rest_py + + +## ``include_merge`` is a boolean +## +## This option tells git-log whether to include merge commits in the log. +## The default is to include them. +## +include_merge = False + +## ``include_author`` is a boolean +## +## This option tells git-log whether to include the author information from +## commits in the log. Default is to include. +## +include_author = False + +## ``space_commit_lines`` is a boolean +## +## This option tells git-log whether to add a newline after each commit +## body. The default is to insert a newline. +## +space_commit_lines = False diff --git a/ChangeLog b/ChangeLog index 4edba05..ae7e4c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,99 +1,139 @@ -CHANGES -======= +Changelog +========= -0.9.0 ------ +0.10.1 (2014-11-18) +------------------- + +- Blacklist broken GitPython release 0.3.2. + + +0.10.0 (2014-10-17) +------------------- + +- Add support and CLI option to search multiple refs for last import. +- Basic tests for import and fix for additional branches. +- Separate out main to make testing easier. +- Ensure tree is walked when ordering commits. +- Add searcher test to find commits when switching branches. +- Standardize imports. +- Let read-tree update index and tree. +- Find commits when parent is before import merge. +- Pick up versioning using pkg_resources or pbr. +- Enable operating on patches with unicode chars in subject lines. +- Wrap markdown documentation to 80 characters. +- Remove ignored PEP8 rule E125 from tox.ini. +- Fix typo in tests/base.py. +- Remove dependency on GitPython from setuptools usage. +- Add initial tests for strategies and searchers. +- Rename doc environment to docs. +- Remove unneeded console script. +- Correcting usage docs on branch name. +- Include creation of branch and provide name in docs. +- Add missing git statement from USAGE.md. +- Updating documentation with the new repository address. +- Update .gitreview file to use stackforge/git-upstream. +- Better workaround for the known issue about missing commits. +- Add a brief and clear description of git-upstream main usecase. +- Add "What git-upstream is not" section to README.md. +- Add PyPI installation documentation. +- Update git-upstream documentation. + + +0.9.0 (2014-07-23) +------------------ + +- Add AUTHORS and ChangeLog files. +- Add KNOWN-ISSUES.md file. +- General documentation improvements. +- Update tests to create isolate git repo. +- Ensure GitPython is present for setup. +- Pep8 and whitespace fixups. +- Fix "'return' outside function" error. +- Remove superfluous doc in the main module. +- Fix a typo in rebaseeditor comment. +- Fix README extension also adding a proper description file. +- Remove remaining HP references. +- Add git-upstream documentation. +- Use GitPython version_info. +- Fix test_lesser_minor unit test. +- Add acknowledges file. +- Rename generate man page command. +- Install bash completion calls. +- Move tests under module. +- Make unittests work with testr. +- Fixed pep8 errors. +- Prepared for upstream integration. +- Rename bash completion script. +- Fix dependencies and build-time commands. +- Update .gitreview. +- Rename hpgit to git-upstream, also changing its license. +- Fix filtering regex for superseded commits. +- Add drop and supersede commands. +- Fix hpgit wrong assumption about upstream branches. +- Allow running of a set of functional tests. +- Fix .gitignore. +- Fix simple_rebase functional test. +- Add functional test framework and some basic tests. +- Add generated hpgit.1 file to .gitignore. +- Avoid importing main during hpgit installation. +- Add setup.cfg. +- Add a check for git version. +- Add ‘dry-run’ command. +- Add commands and log unit tests based on python testtools. +- Improve .gitignore. +- Install rebase-editor.py as a script. +- Fix crash when there are no local changes. +- Fix a crash if there is no commit to be processed. +- Autogenerate man pages for hpgit subcommands. +- Fixes crash if no merge-base commit is found. +- Fixes 'setup doesn't install rebase-editor.py' +- Make the arcomplete package optional. +- Add bash autocomplete code. +- Add missing dependency (GitPython). +- Force string representation of active_branch property. +- Ensure editor can be a multi arg command. +- Line up logging output. +- Implement basic finish functionality. +- Include missing build dependency. +- Fixes for debian packaging. +- Add support for latest GitPython. +- Rename CommitSHA1Filter as a Transform. +- Process filter generators once. +- Add filter to discard duplicate changes based on Gerrit Change-Ids. +- Create version file dynamically based on tags. +- Linearise the the commit history before rebasing. +- Catch missing previous import and trying to extend list with NoneType. +- Apply changes using custom rebase editor. +- Include additional branches in import branch name. +- Move branch reset code to separate method. +- Minor correction to log message. +- Add fallback describe. +- Provide better error if tool run outside of a git directory. +- Add warning message if additional branches are being dropped. +- Remove incorrect reference to args no longer available. +- Create and add default strategy to list commits. +- Searchers and filters to locate and process commits. +- Check for 'detached' state and invalid branches passed. +- Correctly init classes in MRO. +- Fix message when branch cannot be found. +- Convert similar decorators into single decorate that accepts an + argument. +- Support aliased logging levels. +- Move git related properties into a mixin. +- Ensure argument defined for use with log message. +- Remove unused methods or raise exceptions. +- Insert correct copyright and licenses. +- Create a logging mixin class that auto dedents log messages. +- Use logging for output to stdout, stderr and log files. +- Inherit from object class to enable property decorator to function. +- Reduce line lengths and standarize function descriptions. +- Add missing global and fix incorrect exception. +- Rewrite import-upstream subcommand opts/args. +- Add initial subcommand for creating import branches. +- Add framework code for subcommand support. +- Add ignores for python byte-compiled files and pkg files. +- Initial packaging. +- Initial hpgit python project. +- Add README file for project. +- Initialise project with .gitreview file. -* Add AUTHORS and ChangeLog files -* Add KNOWN-ISSUES.md file -* General documentation improvements -* Update tests to create isolate git repo -* Ensure GitPython is present for setup -* pep8 and whitespace fixups -* Fix "'return' outside function" error -* Remove superfluous doc in the main module -* Fix a typo in rebaseeditor comment -* Fix README extension also adding a proper description file -* Remove remaining HP references -* Add git-upstream documentation -* Use GitPython version_info -* Fix test_lesser_minor unit test -* Add acknowledges file -* Rename generate man page command -* Install bash completion calls -* Move tests under module -* Make unittests work with testr -* Fixed pep8 errors -* Prepared for upstream integration -* Rename bash completion script -* Fix dependencies and build-time commands -* Update .gitreview -* Rename hpgit to git-upstream, also changing its license -* Fix filtering regex for superseded commits -* Fix hpgit wrong assumption about upstream branches -* Add drop and supersede commands -* Allow running of a set of functional tests -* Fix .gitignore -* Fix simple_rebase functional test -* Add functional test framework and some basic tests -* Add generated hpgit.1 file to .gitignore -* Avoid importing main during hpgit installation -* Add setup.cfg -* Add a check for git version -* Add ‘dry-run’ command -* Add commands and log unit tests based on python testtools -* Improve .gitignore -* Install rebase-editor.py as a script -* Fixes crash if no merge-base commit is found -* Fix crash when there are no local changes -* Fix a crash if there is no commit to be processed -* Fixes 'setup doesn't install rebase-editor.py' -* Make the arcomplete package optional -* Autogenerate man pages for hpgit subcommands -* Add bash autocomplete code -* Add missing dependency (GitPython) -* Force string representation of active_branch property -* Ensure editor can be a multi arg command -* Line up logging output -* Implement basic finish functionality -* Include missing build dependency -* Fixes for debian packaging -* Add support for latest GitPython -* Rename CommitSHA1Filter as a Transform -* Process filter generators once -* Add filter to discard duplicate changes based on Gerrit Change-Ids -* Create version file dynamically based on tags -* Linearise the the commit history before rebasing -* Catch missing previous import and trying to extend list with NoneType -* Apply changes using custom rebase editor -* Include additional branches in import branch name -* Move branch reset code to separate method -* Minor correction to log message -* Add fallback describe -* Provide better error if tool run outside of a git directory -* Add warning message if additional branches are being dropped -* Remove incorrect reference to args no longer available -* Create and add default strategy to list commits -* Searchers and filters to locate and process commits -* Check for 'detached' state and invalid branches passed -* Correctly init classes in MRO -* Fix message when branch cannot be found -* Convert similar decorators into single decorate that accepts an argument -* Support aliased logging levels -* Move git related properties into a mixin -* Ensure argument defined for use with log message -* Remove unused methods or raise exceptions -* Insert correct copyright and licenses -* Create a logging mixin class that auto dedents log messages -* Use logging for output to stdout, stderr and log files -* Inherit from object class to enable property decorator to function -* Reduce line lengths and standarize function descriptions -* Add missing global and fix incorrect exception -* Rewrite import-upstream subcommand opts/args -* Add initial subcommand for creating import branches -* Add framework code for subcommand support -* Add ignores for python byte-compiled files and pkg files -* Initial packaging -* Initial hpgit python project -* Add README file for project -* Initialise project with .gitreview file