cordova git repos at apache - shadowed at github

[Patrick Mueller <pm...@gmail.com>]

How can arrange to get our shiny new git repos at apache shadowed onto
github, like this: https://github.com/apache/httpd

-- 
Patrick Mueller
http://muellerware.org

Re: cordova git repos at apache - shadowed at github

[Simon MacDonald <si...@gmail.com>]

+1

"Having to keep a github/cordova repo up-to-date seems like a huge waste of
time for me." PM

Simon Mac Donald
http://hi.im/simonmacdonald



On Fri, Jan 13, 2012 at 2:11 PM, Patrick Mueller <pm...@gmail.com> wrote:
> On Fri, Jan 13, 2012 at 14:02, Filip Maj <fi...@adobe.com> wrote:
>
>> So it's time to do something with the two organizations we have in github
>> for the project.
>>
>> I am of the opinion that we should close down both callback and cordova
>> orgs and point everyone to the apache one as a point of interaction on
>> github. I believe Brian has a different opinion. What does everyone else
>> think? If we keep the other orgs all of us maintainers will need to
>> manually keep the various git repos in sync.
>>
>
> +1
>
> Having to keep a github/cordova repo up-to-date seems like a huge waste of
> time for me.
>
> --
> Patrick Mueller
> http://muellerware.org

Re: cordova git repos at apache - shadowed at github

[Patrick Mueller <pm...@gmail.com>]

On Fri, Jan 13, 2012 at 14:02, Filip Maj <fi...@adobe.com> wrote:

> So it's time to do something with the two organizations we have in github
> for the project.
>
> I am of the opinion that we should close down both callback and cordova
> orgs and point everyone to the apache one as a point of interaction on
> github. I believe Brian has a different opinion. What does everyone else
> think? If we keep the other orgs all of us maintainers will need to
> manually keep the various git repos in sync.
>

+1

Having to keep a github/cordova repo up-to-date seems like a huge waste of
time for me.

-- 
Patrick Mueller
http://muellerware.org

Re: cordova git repos at apache - shadowed at github

[Anis KADRI <an...@gmail.com>]

+1 for removing the cordova/callback repos from github. Hopefully by
now everyone knows that Cordova is an Apache project and won't try to
find it on github. It might be useful to squat the cordova/callback
usernames and redirect to the /apache equivalents.

On Fri, Jan 13, 2012 at 1:21 PM, Filip Maj <fi...@adobe.com> wrote:
>
>>> 1. can we be org members w/ the apache mirror, comment, admin, etc w/
>>> the same capabilities provided by having our own org?  do we maintain
>>> the mechanism for pull reqs and review? not clear on this yet. who
>>> maintains the github.com/apache owners list?
>>>
>>
>>My thinking is that we have no presence at GitHub except the shadows that
>>Apache maintains.  It would be nice if folks, including us, can fork those
>>and work out of them if there are GitHub-y things we want to do with our
>>forks.  That would include pull requests doing something interesting.
>
> My thoughts exactly. On top of that, sending a pull request to the
> github.com/apache mirrors sends an email to the dev list, so hopefully
> that is "interesting" enough in terms of pull request handling :)
>

Re: cordova git repos at apache - shadowed at github

[Filip Maj <fi...@adobe.com>]

Awesome, thanks a lot for your help Jukka.

On 12-01-13 4:44 PM, "Jukka Zitting" <ju...@gmail.com> wrote:

>Hi,
>
>On Fri, Jan 13, 2012 at 11:00 PM, Filip Maj <fi...@adobe.com> wrote:
>> Yeah, add remote locally on your machine, pull in the changes, test it
>>out
>> locally. I assume checking CLA stuff is done by hand (as we have done
>>all
>> along anyways). Once you have it merged in locally you can easily push
>>it
>> up to the git apache repo. Theoretically that then will eventually get
>> mirrored back over to github.com/apache (and hopefully auto-close the
>>pull
>> request, too).
>
>Right. The pull requests on Github should get automatically closed as
>soon as the relevant commits hit the target repository. The only
>missing piece is the nice "Merge pull request" button that the Github
>UI provides, but with some effort I suppose we should be able to come
>up with something similar.
>
>>>Also, is all the author/committer stuff maintained properly in the
>>>commit?
>>> Are there some commit hooks to ensure the committer is really a
>>>committer,
>>>and that the author has signed the ICLA?  Guessing we'll have to do the
>>>ICLA check by hand.  But it would be nice to know that the info is
>>>maintained in the repo.
>>
>> Maybe Jukka knows the answer to this?
>
>The authentication when you use your committer account to push stuff
>to git-wip-us is tied to the ICLA you submitted, and that link is then
>internally associated with all Git commits that you push. From the ASF
>perspective that's enough legal audit trail as long as each committer
>is trusted to only push changes that they can contribute under the
>ICLA. (BTW, the lack of such a reliable commit >ICLA audit link is one
>of the key reasons why the ASF can't use Github as the canonical place
>for our repositories.)
>
>Normally when dealing with pull requests from contributors, there's no
>need for extra checks as section 5 of ALv2 [1] already covers
>licensing of intentionally submitted contributions. Thus no extra
>checks are needed when someone actively sends us a patch, a pull
>request or other contribution clearly intended for inclusion in Apache
>Cordova (and it's reasonable to expect that the contributor has the
>right to make such a contribution).
>
>The situation is a bit different when size of the contribution is
>significant (like an entire new component) or when the author of the
>code hasn't intentionally contributed it to us (like the third party
>files mentioned in the thread on NOTICE files). For dealing with such
>cases see the Incubator and the main Apache web sites (or ask us
>mentors).
>
>[1] http://www.apache.org/licenses/LICENSE-2.0
>
>BR,
>
>Jukka Zitting

Re: cordova git repos at apache - shadowed at github

[Jukka Zitting <ju...@gmail.com>]

Hi,

On Fri, Jan 13, 2012 at 11:00 PM, Filip Maj <fi...@adobe.com> wrote:
> Yeah, add remote locally on your machine, pull in the changes, test it out
> locally. I assume checking CLA stuff is done by hand (as we have done all
> along anyways). Once you have it merged in locally you can easily push it
> up to the git apache repo. Theoretically that then will eventually get
> mirrored back over to github.com/apache (and hopefully auto-close the pull
> request, too).

Right. The pull requests on Github should get automatically closed as
soon as the relevant commits hit the target repository. The only
missing piece is the nice "Merge pull request" button that the Github
UI provides, but with some effort I suppose we should be able to come
up with something similar.

>>Also, is all the author/committer stuff maintained properly in the commit?
>> Are there some commit hooks to ensure the committer is really a
>>committer,
>>and that the author has signed the ICLA?  Guessing we'll have to do the
>>ICLA check by hand.  But it would be nice to know that the info is
>>maintained in the repo.
>
> Maybe Jukka knows the answer to this?

The authentication when you use your committer account to push stuff
to git-wip-us is tied to the ICLA you submitted, and that link is then
internally associated with all Git commits that you push. From the ASF
perspective that's enough legal audit trail as long as each committer
is trusted to only push changes that they can contribute under the
ICLA. (BTW, the lack of such a reliable commit >ICLA audit link is one
of the key reasons why the ASF can't use Github as the canonical place
for our repositories.)

Normally when dealing with pull requests from contributors, there's no
need for extra checks as section 5 of ALv2 [1] already covers
licensing of intentionally submitted contributions. Thus no extra
checks are needed when someone actively sends us a patch, a pull
request or other contribution clearly intended for inclusion in Apache
Cordova (and it's reasonable to expect that the contributor has the
right to make such a contribution).

The situation is a bit different when size of the contribution is
significant (like an entire new component) or when the author of the
code hasn't intentionally contributed it to us (like the third party
files mentioned in the thread on NOTICE files). For dealing with such
cases see the Incubator and the main Apache web sites (or ask us
mentors).

[1] http://www.apache.org/licenses/LICENSE-2.0

BR,

Jukka Zitting

Re: cordova git repos at apache - shadowed at github

[Anis KADRI <an...@gmail.com>]

commiters emails addresses used to be checked when git was first setup
so I am guessing it should not be too hard to add a git hook to check
if a commiter has signed the ICLA.

On Fri, Jan 13, 2012 at 2:00 PM, Filip Maj <fi...@adobe.com> wrote:
>
>
> On 12-01-13 1:54 PM, "Patrick Mueller" <pm...@gmail.com> wrote:
>
>>On Fri, Jan 13, 2012 at 16:45, Brian LeRoux <b...@brian.io> wrote:
>>
>>> First cut off the top of my head:
>>>
>>> 1. I fork github.com/apache/cordova-ios
>>> 2. I make a few fixes and send a pull req
>>> 3. that pull req mails this list
>>> 4. ppl review it
>>> 5. looks good, I merge it to the apache.org git repo
>>> 6. changes are reflected on gh mirror
>>>
>>> Sound about right?
>>>
>>
>>Yup.  How we do 5) is what we need to figure out.  What format is the
>>commit in, and how do we apply it to a local repo?  Or maybe it's easier
>>for a committer to add a remote to the contributors repo, and then just
>>merge at the command-line?  Once it's in a local repo, a committer can
>>commit it into the canonical Apache one easy-as-pie.
>
> Yeah, add remote locally on your machine, pull in the changes, test it out
> locally. I assume checking CLA stuff is done by hand (as we have done all
> along anyways). Once you have it merged in locally you can easily push it
> up to the git apache repo. Theoretically that then will eventually get
> mirrored back over to github.com/apache (and hopefully auto-close the pull
> request, too).
>
>>
>>Also, is all the author/committer stuff maintained properly in the commit?
>> Are there some commit hooks to ensure the committer is really a
>>committer,
>>and that the author has signed the ICLA?  Guessing we'll have to do the
>>ICLA check by hand.  But it would be nice to know that the info is
>>maintained in the repo.
>
> Maybe Jukka knows the answer to this?
>

Re: cordova git repos at apache - shadowed at github

[Filip Maj <fi...@adobe.com>]

On 12-01-13 1:54 PM, "Patrick Mueller" <pm...@gmail.com> wrote:

>On Fri, Jan 13, 2012 at 16:45, Brian LeRoux <b...@brian.io> wrote:
>
>> First cut off the top of my head:
>>
>> 1. I fork github.com/apache/cordova-ios
>> 2. I make a few fixes and send a pull req
>> 3. that pull req mails this list
>> 4. ppl review it
>> 5. looks good, I merge it to the apache.org git repo
>> 6. changes are reflected on gh mirror
>>
>> Sound about right?
>>
>
>Yup.  How we do 5) is what we need to figure out.  What format is the
>commit in, and how do we apply it to a local repo?  Or maybe it's easier
>for a committer to add a remote to the contributors repo, and then just
>merge at the command-line?  Once it's in a local repo, a committer can
>commit it into the canonical Apache one easy-as-pie.

Yeah, add remote locally on your machine, pull in the changes, test it out
locally. I assume checking CLA stuff is done by hand (as we have done all
along anyways). Once you have it merged in locally you can easily push it
up to the git apache repo. Theoretically that then will eventually get
mirrored back over to github.com/apache (and hopefully auto-close the pull
request, too).

>
>Also, is all the author/committer stuff maintained properly in the commit?
> Are there some commit hooks to ensure the committer is really a
>committer,
>and that the author has signed the ICLA?  Guessing we'll have to do the
>ICLA check by hand.  But it would be nice to know that the info is
>maintained in the repo.

Maybe Jukka knows the answer to this?

Re: cordova git repos at apache - shadowed at github

[Patrick Mueller <pm...@gmail.com>]

On Fri, Jan 13, 2012 at 16:45, Brian LeRoux <b...@brian.io> wrote:

> First cut off the top of my head:
>
> 1. I fork github.com/apache/cordova-ios
> 2. I make a few fixes and send a pull req
> 3. that pull req mails this list
> 4. ppl review it
> 5. looks good, I merge it to the apache.org git repo
> 6. changes are reflected on gh mirror
>
> Sound about right?
>

Yup.  How we do 5) is what we need to figure out.  What format is the
commit in, and how do we apply it to a local repo?  Or maybe it's easier
for a committer to add a remote to the contributors repo, and then just
merge at the command-line?  Once it's in a local repo, a committer can
commit it into the canonical Apache one easy-as-pie.

Also, is all the author/committer stuff maintained properly in the commit?
 Are there some commit hooks to ensure the committer is really a committer,
and that the author has signed the ICLA?  Guessing we'll have to do the
ICLA check by hand.  But it would be nice to know that the info is
maintained in the repo.

-- 
Patrick Mueller
http://muellerware.org

Re: cordova git repos at apache - shadowed at github

[Brian LeRoux <b...@brian.io>]

Well, I certainly don't dispute that we've dug ourselves into a
conceptually messy situation. I suppose our own individual forks would
have the ability to act with all the needed authority / capability.
I'm comfortable with it. The only thing that remains, from my
perspective, is understanding how maintenance flow looks and
documenting it.

First cut off the top of my head:

1. I fork github.com/apache/cordova-ios
2. I make a few fixes and send a pull req
3. that pull req mails this list
4. ppl review it
5. looks good, I merge it to the apache.org git repo
6. changes are reflected on gh mirror

Sound about right?


On Fri, Jan 13, 2012 at 1:21 PM, Filip Maj <fi...@adobe.com> wrote:
>
>>> 1. can we be org members w/ the apache mirror, comment, admin, etc w/
>>> the same capabilities provided by having our own org?  do we maintain
>>> the mechanism for pull reqs and review? not clear on this yet. who
>>> maintains the github.com/apache owners list?
>>>
>>
>>My thinking is that we have no presence at GitHub except the shadows that
>>Apache maintains.  It would be nice if folks, including us, can fork those
>>and work out of them if there are GitHub-y things we want to do with our
>>forks.  That would include pull requests doing something interesting.
>
> My thoughts exactly. On top of that, sending a pull request to the
> github.com/apache mirrors sends an email to the dev list, so hopefully
> that is "interesting" enough in terms of pull request handling :)
>

Re: cordova git repos at apache - shadowed at github

[Filip Maj <fi...@adobe.com>]

You're the bomb, Jukka!

On 12-01-13 4:58 PM, "Jukka Zitting" <ju...@gmail.com> wrote:

>Hi,
>
>On Fri, Jan 13, 2012 at 10:46 PM, Patrick Mueller <pm...@gmail.com>
>wrote:
>> On Fri, Jan 13, 2012 at 16:21, Filip Maj <fi...@adobe.com> wrote:
>>> ... sending a pull request to the
>>> github.com/apache mirrors sends an email to the dev list, so hopefully
>>> that is "interesting" enough in terms of pull request handling :)
>>
>> I guess we'll see:
>>
>>    https://github.com/apache/incubator-cordova-weinre/pull/1
>
>Hmm, looks like something's wrong as the notification isn't here yet.
>I filed INFRA-4331 [1] to fix that.
>
>[1] https://issues.apache.org/jira/browse/INFRA-4331
>
>BR,
>
>Jukka Zitting

Re: cordova git repos at apache - shadowed at github

[Jukka Zitting <ju...@gmail.com>]

Hi,

On Fri, Jan 13, 2012 at 10:46 PM, Patrick Mueller <pm...@gmail.com> wrote:
> On Fri, Jan 13, 2012 at 16:21, Filip Maj <fi...@adobe.com> wrote:
>> ... sending a pull request to the
>> github.com/apache mirrors sends an email to the dev list, so hopefully
>> that is "interesting" enough in terms of pull request handling :)
>
> I guess we'll see:
>
>    https://github.com/apache/incubator-cordova-weinre/pull/1

Hmm, looks like something's wrong as the notification isn't here yet.
I filed INFRA-4331 [1] to fix that.

[1] https://issues.apache.org/jira/browse/INFRA-4331

BR,

Jukka Zitting

Re: cordova git repos at apache - shadowed at github

[Patrick Mueller <pm...@gmail.com>]

On Fri, Jan 13, 2012 at 16:21, Filip Maj <fi...@adobe.com> wrote:

> ... sending a pull request to the
> github.com/apache mirrors sends an email to the dev list, so hopefully
> that is "interesting" enough in terms of pull request handling :)
>

I guess we'll see:

    https://github.com/apache/incubator-cordova-weinre/pull/1

-- 
Patrick Mueller
http://muellerware.org

Re: cordova git repos at apache - shadowed at github

[Filip Maj <fi...@adobe.com>]

>> 1. can we be org members w/ the apache mirror, comment, admin, etc w/
>> the same capabilities provided by having our own org?  do we maintain
>> the mechanism for pull reqs and review? not clear on this yet. who
>> maintains the github.com/apache owners list?
>>
>
>My thinking is that we have no presence at GitHub except the shadows that
>Apache maintains.  It would be nice if folks, including us, can fork those
>and work out of them if there are GitHub-y things we want to do with our
>forks.  That would include pull requests doing something interesting.

My thoughts exactly. On top of that, sending a pull request to the
github.com/apache mirrors sends an email to the dev list, so hopefully
that is "interesting" enough in terms of pull request handling :)

Re: cordova git repos at apache - shadowed at github

[Patrick Mueller <pm...@gmail.com>]

On Fri, Jan 13, 2012 at 14:22, Brian LeRoux <b...@brian.io> wrote:

> 1. can we be org members w/ the apache mirror, comment, admin, etc w/
> the same capabilities provided by having our own org?  do we maintain
> the mechanism for pull reqs and review? not clear on this yet. who
> maintains the github.com/apache owners list?
>

My thinking is that we have no presence at GitHub except the shadows that
Apache maintains.  It would be nice if folks, including us, can fork those
and work out of them if there are GitHub-y things we want to do with our
forks.  That would include pull requests doing something interesting.

2. brand identity and findability, should we not have the expected url
> at github even if its just s squat repo to point ppl in the right
> direction? there are *many* github.com/apache repos and cordova stuff
> is kinda lost in the noise.
>

Apache is the brand, no?  :-)  FIndability is already pretty good:

    https://github.com/search?q=cordova
    https://www.google.com/search?q=apache+cordova

I'm not actually against having an org at GitHub, but having more GitHub
repo shadows of Apache is hopefully not needed at all.  So what can we do
with an org that doesn't maintain shadows of the Apache repos?

-- 
Patrick Mueller
http://muellerware.org

Re: cordova git repos at apache - shadowed at github

[Brian LeRoux <b...@brian.io>]

I have two concerns.

1. can we be org members w/ the apache mirror, comment, admin, etc w/
the same capabilities provided by having our own org?  do we maintain
the mechanism for pull reqs and review? not clear on this yet. who
maintains the github.com/apache owners list?

2. brand identity and findability, should we not have the expected url
at github even if its just s squat repo to point ppl in the right
direction? there are *many* github.com/apache repos and cordova stuff
is kinda lost in the noise.



On Fri, Jan 13, 2012 at 11:02 AM, Filip Maj <fi...@adobe.com> wrote:
> So it's time to do something with the two organizations we have in github
> for the project.
>
> I am of the opinion that we should close down both callback and cordova
> orgs and point everyone to the apache one as a point of interaction on
> github. I believe Brian has a different opinion. What does everyone else
> think? If we keep the other orgs all of us maintainers will need to
> manually keep the various git repos in sync.
>
> It looks like all of the main committers to each platform have pushed
> something up to the major implementation repos on the apache servers, so
> now we can say that the main code drop point is the apache git server.
> Good job everyone! Slowly migrating :P
>
> On 12-01-13 10:55 AM, "Patrick Mueller" <pm...@gmail.com> wrote:
>
>>On Thu, Jan 12, 2012 at 13:00, Jukka Zitting <ju...@gmail.com>
>> wrote:
>>
>>> I just set up mirrors of the repositories to show up at
>>> http://git.apache.org/ (where we have the read-only git-svn mirrors).
>>> Github should automatically pick them up from there soon enough.
>>>
>>
>>They're there!!  thx!
>>
>>   https://github.com/search?q=incubator-cordova
>>
>>--
>>Patrick Mueller
>>http://muellerware.org
>

Re: cordova git repos at apache - shadowed at github

[Filip Maj <fi...@adobe.com>]

So it's time to do something with the two organizations we have in github
for the project.

I am of the opinion that we should close down both callback and cordova
orgs and point everyone to the apache one as a point of interaction on
github. I believe Brian has a different opinion. What does everyone else
think? If we keep the other orgs all of us maintainers will need to
manually keep the various git repos in sync.

It looks like all of the main committers to each platform have pushed
something up to the major implementation repos on the apache servers, so
now we can say that the main code drop point is the apache git server.
Good job everyone! Slowly migrating :P

On 12-01-13 10:55 AM, "Patrick Mueller" <pm...@gmail.com> wrote:

>On Thu, Jan 12, 2012 at 13:00, Jukka Zitting <ju...@gmail.com>
> wrote:
>
>> I just set up mirrors of the repositories to show up at
>> http://git.apache.org/ (where we have the read-only git-svn mirrors).
>> Github should automatically pick them up from there soon enough.
>>
>
>They're there!!  thx!
>
>   https://github.com/search?q=incubator-cordova
>
>-- 
>Patrick Mueller
>http://muellerware.org

Re: cordova git repos at apache - shadowed at github

[Patrick Mueller <pm...@gmail.com>]

On Thu, Jan 12, 2012 at 13:00, Jukka Zitting <ju...@gmail.com>
 wrote:

> I just set up mirrors of the repositories to show up at
> http://git.apache.org/ (where we have the read-only git-svn mirrors).
> Github should automatically pick them up from there soon enough.
>

They're there!!  thx!

   https://github.com/search?q=incubator-cordova

-- 
Patrick Mueller
http://muellerware.org

Re: cordova git repos at apache - shadowed at github

[Jukka Zitting <ju...@gmail.com>]

Hi,

On Thu, Jan 12, 2012 at 1:41 PM, Patrick Mueller <pm...@gmail.com> wrote:
> How can arrange to get our shiny new git repos at apache shadowed onto
> github, like this: https://github.com/apache/httpd

I just set up mirrors of the repositories to show up at
http://git.apache.org/ (where we have the read-only git-svn mirrors).
Github should automatically pick them up from there soon enough.

BR,

Jukka Zitting

Re: cordova git repos at apache - shadowed at github

[Filip Maj <fi...@adobe.com>]

Then all we'd need is for the wiki to be up (is it up already?), write a
contribution workflow article and we'd be golden.

On 12-01-12 4:41 AM, "Patrick Mueller" <pm...@gmail.com> wrote:

>How can arrange to get our shiny new git repos at apache shadowed onto
>github, like this: https://github.com/apache/httpd
>
>-- 
>Patrick Mueller
>http://muellerware.org