Submitting patches and features: Difference between revisions

From OpenPetra Wiki
Jump to navigation Jump to search
(changes to use Launchpad instead of own server)
No edit summary
Line 1: Line 1:
==Where Contributions to Our Code Base Go To==
==Where Contributions to Our Code Base Go To==
The openPETRA source code is managed with the Bazaar source code versioning system. The official repository of openPETRA can be browsed here: http://code.openpetra.org.
The openPETRA source code is managed with the Git source code versioning system. The official repository of openPETRA can be browsed here: http://code.openpetra.org. This redirects to the OpenPetra Repository at Github.




==How We Handle Contributions to Our Code Base==
==How We Handle Contributions to Our Code Base==
* Write permissions to '''head/trunk''' are given only to the ''core members of the development team'', just to keep the project on one track.  
* Write permissions to '''git origin master''' are given only to the ''core members of the development team'', just to keep the project on one track.  
** We very much need your contributions though, and we will aim to quickly deal with requests from developers who want to submit patches and code!
** We very much need your contributions though, and we will aim to quickly deal with requests from developers who want to submit patches and code!
* We accept ''contributions from non-core members of the development team'' '''only in a Launchpad branch'''.
* We accept ''contributions from non-core members of the development team'' '''only in a Github Pull Request'''.
** You can create your own branch on Launchpad for each feature and for each bug you are working on.
** You can create your own fork on Github for each feature and for each bug you are working on.


See [[Submitting patches and features#Workflow for Contributions]] below for the actual workflow involved.
See [[Submitting patches and features#Workflow for Contributions]] below for the actual workflow involved.
Line 13: Line 13:


===Initial Setup for Contributing===
===Initial Setup for Contributing===
The contributor (=you) needs to have an account on the Launchpad website, as we host the openPETRA Bazaar repository on that server.  
The contributor (=you) needs to have an account at Github, as we host the openPETRA Git repository on that website.  


Please follow the instructions at [[How to work with bazaar on the command line]] or [[How to work with bazaar through the GUI on Windows]] to get an account at Launchpad and to create the SSH keys and to upload the SSH key to Launchpad.
Please follow the instructions at [[How to work with git on the command line]] or [[How to work with git through the GUI on Windows]] to get an account at Github.


===Workflow for Contributions===
===Workflow for Contributions===
# A Bug needs to be created for every single contribution if there isn't already a bug for it (the bug can also be marked as 'Feature' if it is a feature and not a bug!). Anyone who has a sourceforge.net account can do that.
# An Issue needs to be created for every single contribution if there isn't already a bug for it (the bug can also be marked as 'Feature' if it is a feature and not a bug!). The issues are managed in the Github project.  
# A new Branch needs to be created on the Bazaar server. Its name includes the bug number and a shortened title (examples can be found [https://code.launchpad.net/openpetraorg here]).
# You create your own fork of OpenPetra at Github.
## See [[How_to_work_with_bazaar_through_the_GUI_on_Windows#Create_a_new_branch_on_Launchpad|Create a new branch]] for details how to create a new branch
## Only ''You'' will have write access to this fork
### Only ''You'' will have write access to this branch
## ''Everybody else'' can see that this fork exists and has read-only access to it
### ''Everybody else'' can see that this branch exists and has read-only access to it
# You can work on the fork until the the bug is fixed or a new feature is implemented.  
# You can work on the branch until the the bug is fixed or a new feature is implemented.  
## Be sure to do frequent 'rebases'/'merges' from the openPETRA ''trunk'' to ensure that you have changes that are done in trunk and that your code still compiles against it.  
## Be sure to do frequent 'rebases'/'merges' from the openPETRA ''trunk'' to ensure that you have changes that are done in trunk and that your code still compiles against it.  
## You can commit changes to your branch at any time.  
## You can commit changes to your branch at any time.  
Line 32: Line 31:
## Do a last 'rebase'/'merge' from the openPETRA trunk to ensure that you have changes that are done in trunk and that your code still compiles against it.  
## Do a last 'rebase'/'merge' from the openPETRA trunk to ensure that you have changes that are done in trunk and that your code still compiles against it.  
## Run Unit tests which you might have created in the process (or which already exist and cover your code change) after the last 'rebase'/'merge'.
## Run Unit tests which you might have created in the process (or which already exist and cover your code change) after the last 'rebase'/'merge'.
## Make a request to the core development team members to review your changes and to merge your changes to the openPETRA head/trunk.
## Make a request to the core development team members to review your changes and to merge your changes to the openPETRA master.
### Ask for that in the openPETRA IRC chat or in the [http://apps.sourceforge.net/phpbb/openpetraorg/viewforum.php?f=3 openPETRA Developer Forum], mentioning the Bug Number. You can also use the functionality on the Launchpad website for proposing a merge for the branch.
### Create a Github pull request. See https://help.github.com/articles/using-pull-requests/ for details.
# Once your contribution has been reviewed and it got approved, the changes from your developer branch will be merged into the offical openPETRA trunk by a core developer. You will be informed once this has happened.
# Once your contribution has been reviewed and it got approved, the changes from your developer branch will be merged into the offical openPETRA trunk by a core developer. You will be informed once this has happened.
# You are ready for another contribution ;-)
# You are ready for another contribution ;-)

Revision as of 10:24, 23 December 2014

Where Contributions to Our Code Base Go To

The openPETRA source code is managed with the Git source code versioning system. The official repository of openPETRA can be browsed here: http://code.openpetra.org. This redirects to the OpenPetra Repository at Github.


How We Handle Contributions to Our Code Base

  • Write permissions to git origin master are given only to the core members of the development team, just to keep the project on one track.
    • We very much need your contributions though, and we will aim to quickly deal with requests from developers who want to submit patches and code!
  • We accept contributions from non-core members of the development team only in a Github Pull Request.
    • You can create your own fork on Github for each feature and for each bug you are working on.

See Submitting patches and features#Workflow for Contributions below for the actual workflow involved.


Initial Setup for Contributing

The contributor (=you) needs to have an account at Github, as we host the openPETRA Git repository on that website.

Please follow the instructions at How to work with git on the command line or How to work with git through the GUI on Windows to get an account at Github.

Workflow for Contributions

  1. An Issue needs to be created for every single contribution if there isn't already a bug for it (the bug can also be marked as 'Feature' if it is a feature and not a bug!). The issues are managed in the Github project.
  2. You create your own fork of OpenPetra at Github.
    1. Only You will have write access to this fork
    2. Everybody else can see that this fork exists and has read-only access to it
  3. You can work on the fork until the the bug is fixed or a new feature is implemented.
    1. Be sure to do frequent 'rebases'/'merges' from the openPETRA trunk to ensure that you have changes that are done in trunk and that your code still compiles against it.
    2. You can commit changes to your branch at any time.
      1. We encourage you to commit your changes to your branch frequently.
      2. Commit your own changes to your branch before doing a rebase/merge. In that way your changes are kept in separate commits from the changes that others did.
      3. Commit the changes that came in through a rebase/merge to your branch immediately after doing a rebase/merge. In that way changes that others did (in trunk) are kept in separate commits from your changes.
  4. Once you are done with your bug fix or implementation of a feature:
    1. Do a last 'rebase'/'merge' from the openPETRA trunk to ensure that you have changes that are done in trunk and that your code still compiles against it.
    2. Run Unit tests which you might have created in the process (or which already exist and cover your code change) after the last 'rebase'/'merge'.
    3. Make a request to the core development team members to review your changes and to merge your changes to the openPETRA master.
      1. Create a Github pull request. See https://help.github.com/articles/using-pull-requests/ for details.
  5. Once your contribution has been reviewed and it got approved, the changes from your developer branch will be merged into the offical openPETRA trunk by a core developer. You will be informed once this has happened.
  6. You are ready for another contribution ;-)