Open Stack

Pleased to announce the 0.11.0 release of git-upstream.


With source available at:

    http://git.openstack.org/cgit/openstack/git-upstream

Please report any issues through launchpad:

    https://bugs.launchpad.net/git-upstream


git-upstream is an open source Python application that can be used to
keep in sync with upstream open source projects, mainly OpenStack.

For more info on what git-upstream is for:

    https://pypi.python.org/pypi/git-upstream



For more details see below.

Changes in git-upstream 0.10.1..0.11.0
--------------------------------------

b271750 Changelog for 0.11.0 Release
227be23 Ask rev-parse for shortest unique SHA1
a4342f4 Remove upstream branch requirement from '--finish'
394a9b7 Move logging setup earlier
f0f03b4 Support a finalize method for argument parsing
f41f3f9 Fix order of commits from previous imports
3d641bc Convert strategy tests to use scenarios
60aac04 Have pbr update AUTHORS but not changelog
ba47733 Fix manpage building
126feca Remove '\' from multiline strings
c13695d Improve detection of the previous import merge
5c523d6 Begin conversion to testscenarios
dcffac3 Include node 'name' in commit subject
0414e5f Update typos
2e45b55 Add more complex usage summary for import command
1621091 Tidy up fixture usage
7158716 Use standard library for text generation
49e87a2 Update ChangeLog with missing releases
795abb7 tests: Switch to use list as stack
ea9b4af Capture log messages for test failures
2631be6 Add option to perform finish only
33007ad Grammar fixes
be2bb18 Allow direct execution of main module
8f7f2f9 Change repository from stackforge to openstack
ada3917 Update .gitreview for new namespace
dc9567b Update the read-tree command in USAGE.md
3fb410c Re-factor and split code
ca9eefd Restructure subcommands parser creation
7e9436f Mask broken versions of mock
3384eb5 Sample jobs for mirroring upstream repositories
66004d0 Find additional missing commit scenarios
be0d8d6 Use DFS reverse topological sort to allow unordered inputs
0e6416d Make function private and replace boolean with function result
dfe55f6 Update hacking, enable some checks and fix style issues
964d5c7 Catch BadName exceptions from newer GitPython
e9bf6db Additional scenarios that result in missed commits
77e560f Add test for obsolete approach to track upstream
d4eeebc Refactor code used to build tree into helpers
589948b Add test support for creating carried changes
14122e2 Include graph of git log and node info on error
ed82333 Fix typo
80e1741 Workflow documentation is now in infra-manual

Diffstat (except docs and test files)
-------------------------------------

.gitchangelog.rc                         | 104 ++++
.gitreview                               |   2 +-
.mailmap                                 |   2 +
AUTHORS                                  |  15 +-
ChangeLog                                | 281 +++++++----
DESCRIPTION                              |  12 +-
README.md                                |   4 +-
USAGE.md                                 |   6 +-
build_manpage.py                         |   4 +-
contrib/jjb/defaults.yaml                |   5 +
contrib/jjb/macros.yaml                  |  74 +++
contrib/jjb/mirror.yaml                  |  57 +++
contrib/jjb/projects.yaml                |  11 +
contrib/jjb/scripts/mirror-upstream.bash |  64 +++
git_upstream/commands/__init__.py        |  79 ++-
git_upstream/commands/drop.py            | 130 +----
git_upstream/commands/help.py            |  40 ++
git_upstream/commands/import.py          | 796
+++++++------------------------
git_upstream/commands/supersede.py       | 215 ++-------
git_upstream/lib/drop.py                 | 122 +++++
git_upstream/lib/importupstream.py       | 406 ++++++++++++++++
git_upstream/lib/note.py                 |   3 +-
git_upstream/lib/pygitcompat.py          |   9 +-
git_upstream/lib/rebaseeditor.py         |  27 +-
git_upstream/lib/searchers.py            | 277 +++++++----
git_upstream/lib/strategies.py           | 128 +++++
git_upstream/lib/supersede.py            | 167 +++++++
git_upstream/log.py                      |   6 +-
git_upstream/main.py                     |  64 +--
git_upstream/rebase_editor.py            |  15 +-
git_upstream/subcommand.py               |  26 -
setup.cfg                                |   3 +
test-requirements.txt                    |   7 +-
tox.ini                                  |   3 +-
34 files changed, 1914 insertions(+), 1250 deletions(-)


Requirements updates
--------------------

diff --git a/test-requirements.txt b/test-requirements.txt
index f2efc91..6db383b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,3 @@
-hacking>=0.5.6,<0.8
-mock
+hacking>=0.9,<=0.10.0
+loremipsum
+mock!=1.1.1,<=1.3.0
@@ -7,0 +9 @@ testrepository>=0.0.17
+testscenarios>=0.4
@@ -9,0 +12 @@ sphinxcontrib-programoutput
+PyYAML>=3.1.0

-- 
Regards,
Darragh Bailey
IRC: electrofelix
"Nothing is foolproof to a sufficiently talented fool" - Unknown