Re: [orion-dev] how to receive a contribution from github (was Re: comma

[Carolyn MacLeod <Carolyn_MacLeod@xxxxxxxxxx>]

Thanks for clarifying and documenting!

Just so others know, here is the wiki
page for non-committers contributing code to Orion: http://wiki.eclipse.org/Orion/Contributing_Code
The page is written for both contributors
(i.e. pass this link to anyone new who may contribute) and committers who
are reviewing/testing/pushing contributions.

Car

From:	Susan Franklin McCourt <susan_franklin@xxxxxxxxxx>
To:	Orion developer discussions <orion-dev@xxxxxxxxxxx>
Date:	25/01/2012 11:47 AM
Subject:	Re: [orion-dev] how to receive a contribution from github (was Re: command line/console in Orion)
Sent by:	orion-dev-bounces@xxxxxxxxxxx

---

That's a great description!

That's my process too. I updated the wiki yesterday with those similar
steps, and clarified the directions for contributors.
Would you mind adding the pictures to the wiki in places where there are
not any?

I personally find the most frustrating part to be guessing the branch if
you don't know it and it wasn't specified. Given my time zone, often people
are gone by the time I'm looking at a bug, and then I fumble around in
github and or our git log to try to find it, if it's not obvious. We have
*a lot* of branches in org.eclipse.orion.client so yesterday with 4 contributor
remotes attached, I had 25 pages of branches to scroll through. The only
reason to need to know the branch is to follow the Orion workflow. 

We also happen to have a number of bugs that make each step between knowledge
of the commit id in github and the cherry pick in Orion just a little bit
more painful than it needs to be . I marked them as dependents on [1].

Being able to handle a pull request or some Orion link equivalent would
be great in the future, but there are a lot of little things getting in
the way now. Fortunately, they hit the committer and not the contributor.

susan

[1]https://bugs.eclipse.org/bugs/show_bug.cgi?id=369591

Felipe
Heidrich ---01/25/2012 08:05:38 AM---My process to receive a contribution
from github to Orion. Go to the bug report, for this example I

From: Felipe Heidrich <Felipe_Heidrich@xxxxxxxxxx>
To: Orion developer discussions <orion-dev@xxxxxxxxxxx>
Date: 01/25/2012 08:05 AM
Subject: [orion-dev] how to receive a contribution
from github (was Re: command line/console in Orion)
Sent by: orion-dev-bounces@xxxxxxxxxxx

---

My process to receive a contribution from github to Orion.

Go to the bug report, for this example I chose: 
Fix bug 368877 - Status Messages cannot be read by screen reader 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=368877

In the bug there must be a link to the commit in github, in this case:
https://github.com/max-li/orion.client/commit/37937d27dcab9963601cfdc05ac81794ff4b0e98

It will look like this:

Note that you can't tell in which branch the commit is, you will need to
know that later, you can either assume it is in the master or ask the author
in the bug report. 

Now click in the link indicated by the red arrow, it will take to this
page:

Copy the URL in marked box. 

Back to Orion, go to the Repositories page and select "New Remote"

In the dialog enter whatever name you like and the URL you copied from
github, click Ok

Go to the bottom of the page, you should see your newly added repository
at end. Click "Fetch"

Still in the repositories page, click on See all branches.
In the bug report, the author said that commit is in the accessibility
branch, so I'll look for the branch maxli/accessibility in the all branches
list and when I find it I'll click on the git log for it:

Here I had little bit of hard time in the new UI. From the link for the
commit in github I know the commit was made on Jan 18th and the first page
of the git log is not showing me that. 
The only way I found to move to page 2 was to change the URL from 
http://orion.eclipse.org/git/git-log.html#/gitapi/remote/maxli/accessibility/file/B_/?page=1
to 
http://orion.eclipse.org/git/git-log.html#/gitapi/remote/maxli/accessibility/file/B_/?page=2
Now I need to find the commit by comment. If the author followed our convention
the commit has the same name as the problem report. In this case: 
"Fix bug 368877 - Status Messages cannot be read by screen reader"
If not, just go back to the commit link in github and look for the comment.

In this example it looks like this:

Now all you have to do is to click on that sexy cherry pick icon and voila.

Assuming no real conflict happen you have the commit in your current branch,
you can test the changes and push the commit to remote/master when you
are done. 
If you need to make changes before pushing the fix I suggest to add a new
commit which you can label "review of bug XXX". This way you
preserve the authorship for original commit. 
Also note that the very first step you only need to do it once (by remote).


Felipe 






_______________________________________________
orion-dev mailing list
orion-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/orion-dev
_______________________________________________
orion-dev mailing list
orion-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/orion-dev