Staying close to latest from OpenStack through git-upstream
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Andreas Jaeger 1c6ac903da Update docs jobs 1 month ago
bash_completion Rename bash completion script 5 years ago
contrib/jjb Update typos 3 years ago
doc Trivial: Update pypi url to new url 1 year ago
functional-tests Update typos 3 years ago
git_upstream Align with openstack check-requirements 1 year ago
.gitchangelog.rc Update ChangeLog with missing releases 3 years ago
.gitignore Update .gitignore with .eggs path for setuptools 2 years ago
.gitreview OpenDev Migration Patch 2 months ago
.mailmap Consolidate some author email addresses 2 years ago
.testr.conf Move tests under module 5 years ago
.zuul.yaml Update docs jobs 1 month ago
ACKNOWLEDGEMENTS Add acknowledges file 5 years ago
AUTHORS Consolidate some author email addresses 2 years ago
ChangeLog Update ChangeLog for 0.12.1 2 years ago
DESCRIPTION Change repository from stackforge to openstack 3 years ago
LICENSE Rename hpgit to git-upstream, also changing its license 5 years ago
README.rst Trivial: Update pypi url to new url 1 year ago
docs-requirements.txt Include files for sphinx based documentation 2 years ago
requirements.txt Use a recent pbr 2 years ago
setup.cfg Trivial: Update pypi url to new url 1 year ago
setup.py Move build_manpage utility to doc area 2 years ago
test-requirements.txt Update docs jobs 1 month ago
tox.ini Add tox env for checking links in docs 2 years ago

README.rst

What is git-upstream?

Git-upstream is an open source Python application that can be used to keep in sync with upstream open source projects. Its goal is to help manage automatically dropping carried patches when syncing with the project upstream, in a manner transparent to local developers.

It was initially developed as a tool for people who are doing active contributions to local mirrors of projects hosted using Gerrit for code review, with the intention that the local changes would be submitted to the upstream Gerrit instance (review.openstack.org for OpenStack) in the future, and would subsequent appear in the upstream mainline.

As it uses git plumbing commands, it can identify identical patches exactly the same as how git-rebase works, and is not limited to working with Gerrit hosted projects. It can be used with projects hosted in GitHub or any other git repo hosting software.

Online documentation:

To install:

See also https://pypi.org/project/git-upstream

You can also install directly from source:

Developers

Bug reports:

Repository:

Cloning:

or

A virtual environment is recommended for development. For example, git-upstream may be installed from the top level directory:

Patches are submitted via Gerrit at:

Please do not submit GitHub pull requests, they will be automatically closed.

More details on how you can contribute is available on our wiki at:

Writing a patch

All code submissions must be pep8 and pyflakes clean. CI will automatically reject them if they are not. The easiest way to do that is to run tox before submitting code for review in Gerrit. It will run pep8 and pyflakes in the same manner as the automated test suite that will run on proposed patchsets.

Unit Tests

Unit tests have been included and are in the git_upstream/tests folder. Many unit tests samples are included as example scenarios in our documentation to help explain how git-upstream handles various use cases. To run the unit tests, execute the command:

  • Note: View tox.ini to run tests on other versions of Python, generating the documentation and additionally for any special notes on building one of the scenarios to allow direct inspection and manual execution of git-upstream with various scenarios.

The unit tests can in many cases be better understood as being closer to functional tests.

Support

The git-upstream community is found on the #git-upstream channel on chat.freenode.net

You can also join via this IRC URL or use the Freenode IRC webchat.

What does git-upstream do?

git-upstream provides new git subcommands to support rebasing of local-carried patches on top of upstream repositories. It provides commands to ease the use of git for who needs to integrate big upstream projects in their environment. The operations are performed using Git commands.

Note

Currently git-upstream works best for projects that are maintained with Gerrit because the presence of Change-Ids allows for fully automated dropping of changes that appear upstream. Nevertheless, the code is quite modular and can be extended to use any part of commit message (e.g., other headers).

Git-upstream currently supports the following features

  • Single upstream branch import

Your repository is tracking an upstream project and has local changes applied and no other branch is merged in. This can also be applied to tracking upstream packaging branches: e.g., ubuntu/master => ubuntu/saucy-proposed/nova + local packaging changes.

  • Multi branch import (upstream branch + additional branches)

In this case, your project tracks an upstream repository, merges in an arbitrary number of branches and applies local carried changes.

  • Re-reviewing

Reviewing (w/ Gerrit) of all locally applied changes if desired. git-upstream creates an import branch in a manner that allows it to be fully re-reviewed or merged into master and pushed.

  • Detailed logging

git-upstream can output to both console and log file simultaneously. Multiple log levels are supported, and these are managed separately for log file and console output. This means jobs run by Jenkins can save a detailed log file separately as an artefact while printing status information to the console if those running the jobs don’t wish to have the console spammed with the details.

  • Dropping of changes that appear upstream

Compares Change-Id's of changes applied since previous import with those that have appeared on the upstream branch since the last import point.

  • Interactive mode

Once the list of changes to be re-applied has been determined (and those to be dropped have been pruned), the tool can open an editor (controlled by a user's git editor settings) for users to review those changes to be made and allow them to perform further operations such as re-ordering, dropping of obsolete changes, and squashing.

  • Dropping local changes

It’s always possible for local changes to be superseded by upstream changes, so when these are identified and marked as such, we should drop them.

This can also occur where a change was applied locally, modified when being upstreamed based on review feedback and the resulting differences were ported to the internal as well. While the original change will be automatically dropped, also useful to drop the additional ported changes automatically if possible, rather than have it cause conflicts.

Using git-upstream

Please see workflows

Available commands

Please see subcommands

Authors

git-upstream was initially written by Darragh Bailey dbailey@hpe.com. See AUTHORS file for other contributors.

Acknowledgements

Thanks to Aleksander Korzynski and Stanisław Pitucha for taking the original design spec and some basic manual steps and experimenting with initial implementations.

To Davide Guerri, for picking up a rough python tool and turning it into something that was actually usable.

Also to Jon Paul Sullivan and Monty Taylor to listening and providing a sounding board for different approaches.

And finally to Coleman Corrigan among numerous others who acted as willing guinea pigs for the original manual approach.

Hope this eventually helped save you time and some hair.