Submitting patches and features: Difference between revisions

From OpenPetra Wiki
Jump to navigation Jump to search
(changes to use Launchpad instead of own server)
Line 6: Line 6:
* 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 '''head/trunk''' 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 developer branches''' on the main repository.
* We accept ''contributions from non-core members of the development team'' '''only in a Launchpad branch'''.
** A developer branch is created for each feature a certain developer creates and for each bug he fixes.
** You can create your own branch on Launchpad 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 our Bazaar server, as we host the openPETRA Bazaar repository on our own server, rather than on sourceforge.net. For that we need a public SSH key of you. Such a key can be created as follows:
The contributor (=you) needs to have an account on the Launchpad website, as we host the openPETRA Bazaar repository on that server.  
# Open a Windows Explorer window and navigate to the path where PuTTY is installed.
# Start puttygen.exe in that folder.
# Click on "Generate" and follow the instructions.
# Once finished with the key generation, right-click on the multi-line textbox that contains text starting with "ssh-rsa" and select "Copy".
# Click 'Save public key' and 'Save private key'.
# Send an email to [mailto:info@openpetra.org info@openpetra.org] with the following content:
Please create a user for me on the openPETRA Bazaar code repository so I can have write access to my
openPETRA branches.
My name: ZZZZZZZZZZZ.
My SSH Key:
XXXXXXXXXXXXXXX


- replacing the '''Z''''s with your name and the '''X''''s with the pasted text from the PuTTY Key Generator.
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.
 
You will be informed once a user has been created for you.


===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.
# 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.
# 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 [http://bzr.openpetra.org:8088/ here]).
# 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]).
## If you need a new branch, just ask for it 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.
## 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
## The branch you requested will be created for you
### Only ''You'' will have write access to this branch
### ''You'' will be given write access to this branch (and only this branch) by a member of the core development team.
### ''Certain members of the core development team'' will also have write access to it, but won't write to your branch, except in unusual circumstances (e.g. you 'disappear' and leave a bug/feature halfway implemented and we want/need to finish it in this branch).
### ''Everybody else'' can see that this branch 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 branch 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.  
Line 50: Line 33:
## 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 head/trunk.
### 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.
### 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.
# 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:16, 3 Ocak 2012

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.


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.
    • 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.
    • You can create your own branch on Launchpad 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 on the Launchpad website, as we host the openPETRA Bazaar repository on that server.

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.

Workflow for Contributions

  1. 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.
  2. 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 here).
    1. See Create a new branch for details how to create a new branch
      1. Only You will have write access to this branch
      2. Everybody else can see that this branch exists and has read-only access to it
  3. You can work on the branch 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 head/trunk.
      1. Ask for that in the openPETRA IRC chat or in the openPETRA Developer Forum, mentioning the Bug Number. You can also use the functionality on the Launchpad website for proposing a merge for the branch.
  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 ;-)