Jump to: navigation, search

Difference between revisions of "Orion/Contributing Code"

m (For Orion Committers: pulling in the changes)
m (For Orion Committers: pulling in the changes)
Line 36: Line 36:
 
# Using Orion's Repository page, browse to your local clone of the repo. Click '''New Remote''' and paste in the URL from the previous step.
 
# Using Orion's Repository page, browse to your local clone of the repo. Click '''New Remote''' and paste in the URL from the previous step.
 
# Using Orion's Repository view, drill into the committer's remote, and open the '''Git Log''' page on whatever branch their changes are in.<br><br><b>Note:</b> [https://bugs.eclipse.org/bugs/show_bug.cgi?id=369297 Bug 369297] currently blocks this step. You can use the old repository page (/git/git-clone.html) as a temporary workaround.
 
# Using Orion's Repository view, drill into the committer's remote, and open the '''Git Log''' page on whatever branch their changes are in.<br><br><b>Note:</b> [https://bugs.eclipse.org/bugs/show_bug.cgi?id=369297 Bug 369297] currently blocks this step. You can use the old repository page (/git/git-clone.html) as a temporary workaround.
# From the Git Log page, click the '''Cherry Pick''' icon beside the commit(s) you want to grab.<br>This will apply the contributor's changes to your active branch.
+
# From the Git Log page, click the '''Cherry Pick''' icon beside the commit(s) you want to grab. This will apply the commit to your active branch.
 
# Open the Git Log view on your active branch. Verify that the contributor's commit(s) are present, and that their name appears in the "Author" field. (Your name should appear in the "Committer" field.)
 
# Open the Git Log view on your active branch. Verify that the contributor's commit(s) are present, and that their name appears in the "Author" field. (Your name should appear in the "Committer" field.)
 
# Push.
 
# Push.

Revision as of 17:36, 20 January 2012

The Orion project welcomes code contributions from the public. This page details how to set up a work environment and submit code changes for review and inclusion by a committer.

Identify an opportunity

Bug fixes are the most common type of code contribution. For a list of currently-open Orion bugs see the Eclipse Bugzilla database. If a bug's Assignee is an "inbox" name (eg.- "orion.client-inbox@eclipse.org") then it has not been assigned to anyone yet, and is a good candidate for investigation. If you plan to fix a bug in Orion that does not already have a bug report then be sure to first log a report, and in the initial comment specify that you are investigating a fix for it. This report should be logged up-front so that if the bug is not one that should be fixed (for example, it is actually working as designed, its component is in the midst of a re-write, etc.), then a committer can add a follow-up comment indicating that the bug is not worth investigating.

New features/enhancements can also be contributed, but for these it is important that a committer comment in its bug report indicate that the feature is desirable. The potential for feature work in any project is limitless, but not all features are good fits, so a feature that was not pre-approved by a committer risks not being ultimately accepted.

Set up a Git repository

The first step is to establish a Git repository. The remainder of this page assumes that GitHub is being used to host your repository, since it is a well-established Git hosting service and the Orion repository is mirrored there. However using GitHub is not a strict requirement.

Once you have a user account on GitHub, start by creating forks of the https://github.com/eclipse/orion.client and/or https://github.com/eclipse/orion.server repositories. These repositories will initially contain the latest Orion code in their "master" branch, and will eventually receive your code changes for submission.

Github-fork.jpg

Clone your GitHub repository

The next step is to clone your newly-created repository into your work environment. For example, if you are planning to use Orion to develop Orion client-side code then you will clone the GitHub repository as described here. Alternatively, if you will be developing Orion server-side code then you will likely use Eclipse as your development environment, and either EGit or command-line Git for cloning your GitHub repository locally.

You can now load the retrieved project(s) from your cloned repository into your workspace. But before you begin hacking, be sure to create a new branch for your work on this particular task. This branch is where you will ultimately make your changes available from.

For more info on developing Orion see the Development Resources section.

Commit your changes

When your changes are ready for submission, you first commit them to your cloned Git repository (in your newly-created branch), and then push this repository to your GitHub repository. For more detailed information on using Orion's Git facilities see the Orion User Guide.

Request adoption of your changes

Finally, add a comment to the Orion bug report indicating that you have changes that you want to submit, and provide the URL of your GitHub repository (read-only access is fine) and the name of the branch containing your changes. It will then be up to a committer to review your change, ask questions, suggest improvements, etc. Once the change is deemed to be ready then the committer can add it to the Orion repository.

For Orion Committers: pulling in the changes

Here's how an Orion committer (you) grabs the contributor's changes from GitHub:

  1. Go to the GitHub profile of the community member who wants to contribute the changes.
  2. Copy the URL of their GitHub clone. It will look something like git@github.com:someusername/orion.client.git
  3. Using Orion's Repository page, browse to your local clone of the repo. Click New Remote and paste in the URL from the previous step.
  4. Using Orion's Repository view, drill into the committer's remote, and open the Git Log page on whatever branch their changes are in.

    Note: Bug 369297 currently blocks this step. You can use the old repository page (/git/git-clone.html) as a temporary workaround.
  5. From the Git Log page, click the Cherry Pick icon beside the commit(s) you want to grab. This will apply the commit to your active branch.
  6. Open the Git Log view on your active branch. Verify that the contributor's commit(s) are present, and that their name appears in the "Author" field. (Your name should appear in the "Committer" field.)
  7. Push.
  8. Thank the contributor. :)