Move git-cl into depot_tools....

Move git-cl into depot_tools.

BUG=none
TEST=git-cl works after move

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70011

[chase, 2010-11-16 21:33:22]

To make changing git-cl easier, we're moving git-cl and its files into
depot_tools.  Since Oct 18, git-cl updates depot_tools itself.  It's safe to
claim that once committed, git-cl users will get this change the next time they
run git-cl.

We can remove the git.chromium.org/git/git-cl.git repository after this change
lands and we send a final message to the dev lists letting git-cl users know
they should manually run svn update in depot_tools (in case they have a pre-Oct
18 copy).

[Mandeep Singh Baines, 2010-11-16 22:53:59]

Why? Is this really a problem?

chase@chromium.org (chase@chromium.org) wrote:
> Reviewers: Marc-Antoine Ruel,
> 
> Message:
> To make changing git-cl easier, we're moving git-cl and its files into
> depot_tools.  Since Oct 18, git-cl updates depot_tools itself.  It's safe to
> claim that once committed, git-cl users will get this change the
> next time they
> run git-cl.
> 
> We can remove the git.chromium.org/git/git-cl.git repository after
> this change
> lands and we send a final message to the dev lists letting git-cl users know
> they should manually run svn update in depot_tools (in case they
> have a pre-Oct
> 18 copy).
> 
> Description:
> Move git-cl into depot_tools.
> 
> BUG=none
> TEST=git-cl works after move
> 
> Please review this at http://codereview.chromium.org/5012006/
> 
> SVN Base: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
> 
> Affected files:
>   M     git-cl
>   A     git_cl/.gitignore
>   A     git_cl/LICENSE
>   A     git_cl/PRESUBMIT.py
>   A     git_cl/README
>   A     git_cl/README.codereview
>   A     git_cl/README.testing
>   A     git_cl/__init__.py
>   A     git_cl/git-cl
>   A     git_cl/git_cl.py
>   A     git_cl/test/abandon.sh
>   A     git_cl/test/basic.sh
>   A     git_cl/test/hooks.sh
>   A     git_cl/test/push-basic.sh
>   A     git_cl/test/push-from-logs.sh
>   A     git_cl/test/rename.sh
>   A     git_cl/test/save-description-on-failure.sh
>   A     git_cl/test/submit-from-new-dir.sh
>   A     git_cl/test/tbr.sh
>   A     git_cl/test/test-lib.sh
>   A     git_cl/test/upload-stale.sh
>   A     git_cl/upload.py
> 
> 

[chase, 2010-11-16 23:35:39]

On 2010/11/16 22:53:59, Mandeep Singh Baines wrote:
> Why? Is this really a problem?

Yeah, based on latest stats* git-cl is used by 150+ Chromium developers.  Since
git-cl's hosted on git.chromium.org, Chromium developers that already have write
access to svn.chromium.org and are used to making depot_tools changes still need
to jump through some extra hoops to get write access to git.chromium.org, too. 
As for users, if git-cl is hosted in depot_tools alone, they'll only ever need
an updated depot_tools to get the latest version.

*
https://groups.google.com/a/google.com/group/chrome-infrastructure-team/brows...

[Mandeep Singh Baines, 2010-11-16 23:59:09]

On Tue, Nov 16, 2010 at 3:35 PM,  <chase@chromium.org> wrote:
> On 2010/11/16 22:53:59, Mandeep Singh Baines wrote:
>>
>> Why? Is this really a problem?
>
> Yeah, based on latest stats* git-cl is used by 150+ Chromium developers.
>  Since
> git-cl's hosted on git.chromium.org, Chromium developers that already have
> write
> access to svn.chromium.org and are used to making depot_tools changes still
> need
> to jump through some extra hoops to get write access to git.chromium.org,
> too.
> As for users, if git-cl is hosted in depot_tools alone, they'll only ever
> need
> an updated depot_tools to get the latest version.

I don't think this is a good idea. git-cl is useful independent of
Chromium. It should
be useful to anyone that wants to use rietveld for reviewing git code.
Not sure if anyone
of outside of Chromium is using it but slurping it into depot_tools
just seems wrong.
To use git-cl, I need to checkout a subversion repository (OK I can
use git-svn).

How big of an inconvenience is this? Other than maruel, I don't see a
lot of commits
going into git-cl. This is a good thing. git-cl solves a simple
problem. I'd start to worry
if there were lots of patches going in.

Anyway, I'm not in favor of this change but don't want to stand in the
way if others
feel strongly.

> *
>
https://groups.google.com/a/google.com/group/chrome-infrastructure-team/brows...
>
> http://codereview.chromium.org/5012006/
>

[chase, 2010-11-17 00:20:37]

On 2010/11/16 23:59:09, Mandeep Singh Baines wrote:
> I don't think this is a good idea. git-cl is useful
> independent of Chromium. It should be useful to anyone
> that wants to use rietveld for reviewing git code.
> Not sure if anyone of outside of Chromium is using it
> but slurping it into depot_tools just seems wrong.
> To use git-cl, I need to checkout a subversion
> repository (OK I can use git-svn).

Yeah, this was not meant to make it harder for ChromeOS developers.  It looks
like Chrome and ChromeOS dev setups aren't similar in this regard. :/

> How big of an inconvenience is this? Other than maruel,
> I don't see a lot of commits going into git-cl. This is
> a good thing. git-cl solves a simple problem. I'd start
> to worry if there were lots of patches going in.

Some have attempted to make changes themselves and not succeeded.  We're
motivated to make things simpler, but this may not be simpler all around. 
Thanks for the feedback.

[M-A Ruel, 2010-11-17 20:19:36]

There's 3 types of git-cl users:

1) chromium devs using the git-svn functionality
2) chromium os devs using the 'normal' git workflow
3) other devs working outside chromium

Doing this change only helps (in theory) 1) excluding devs also member of 2). In
theory, getting commit access to chromium os for a chromium committer isn't
hard. In practice it has been shown to be sometime error prone, but mostly due
to communication errors and misinformation.

The cost the current setup represents to me is negligible. It takes me as much
time to explain someone to fix his svn checkout (since it's read-only by
default) than to explain how to add a writeable remote to git_cl_repo.
Committing the patch on behalf of the contributor is also negligible. The only
reason I try to force contributors to commit themselves is to keep a saner
svn/git log.

The main reason I'm fine with this change is for 2) users: they already have a
dependency on depot_tools _anyway_. Their presubmit scripts looks for
depot_tools in the path and having git-cl an independent checkout may make users
to be more prone to having stale depot_tools checkouts.

So in the end I'm fine with the change due to the explicit dependency currently
in chromium os infrastructure.

http://codereview.chromium.org/5012006/diff/3001/git-cl
File git-cl (right):

http://codereview.chromium.org/5012006/diff/3001/git-cl#newcode7
git-cl:7: repo="$base_dir/git_cl"
I'm not sure this line is useful.

[chase, 2010-11-19 19:17:30]

1. git-cl requires depot_tools anyway.
2. git-cl has a forked copy of upload.py that can go away with this change.
3. The change should be transparent to git-cl users.
4. M-A is fine with the change, MSB was last not in favor (but this was before
M-A's comments).

M-A requests that I not land this today since other changes are in-flight.  I'll
hold for now and take another look early next week.

[chase, 2010-11-19 19:39:53]

On 2010/11/17 20:19:36, Marc-Antoine Ruel wrote:
> http://codereview.chromium.org/5012006/diff/3001/git-cl
> File git-cl (right):
> 
> http://codereview.chromium.org/5012006/diff/3001/git-cl#newcode7
> git-cl:7: repo="$base_dir/git_cl"
> I'm not sure this line is useful.

Removed. :)

[chase, 2010-12-22 19:09:11]

M-A pinged me about this CL this morning.  Assuming no objections, I plan to
land it this afternoon.

[chase, 2010-12-22 19:26:44]

Updated patch with latest changes in git_cl_repo.

[mr.kschan, 2010-12-24 07:09:11]

On 2010/12/22 19:26:44, chase wrote:
> Updated patch with latest changes in git_cl_repo.

Hi there,

what is the impact of this CL to those "3) other devs working outside
chromium"??? (i'm one of those :)

i started to see blaming of missing depot_tools when I `git cl upload` and `git
cl push`.

[chase, 2010-12-24 07:25:14]

On 2010/12/24 07:09:11, mr.kschan wrote:
> Hi there,
> 
> what is the impact of this CL to those "3) other devs working outside
> chromium"??? (i'm one of those :)
> 
> i started to see blaming of missing depot_tools when I `git cl upload` and
`git
> cl push`.

Are you seeing this error now?  I landed
http://src.chromium.org/viewvc/chrome?view=rev&revision=70108 earlier today to
fix that after getting the same error.  Can you make sure your depot_tools is at
HEAD (has 70108) and let me know what happens after trying again?

[mr.kschan, 2010-12-24 07:32:24]

On Fri, Dec 24, 2010 at 3:25 PM, <chase@chromium.org> wrote:

> On 2010/12/24 07:09:11, mr.kschan wrote:
>
>> Hi there,
>>
>
>  what is the impact of this CL to those "3) other devs working outside
>> chromium"??? (i'm one of those :)
>>
>
>  i started to see blaming of missing depot_tools when I `git cl upload` and
>>
> `git
>
>> cl push`.
>>
>
> Are you seeing this error now?  I landed
> http://src.chromium.org/viewvc/chrome?view=rev&revision=70108 earlier
> today to
> fix that after getting the same error.  Can you make sure your depot_tools
> is at
> HEAD (has 70108) and let me know what happens after trying again?


For your info, i was using the git-cl copy from
http://git.chromium.org/gitweb/?p=git-cl.git;a=commit;h=c3f0433a0e6520297950c...
i believe it should be stale now.

Anyway, i will try out git-cl with the svn HEAD sooner or later.

merry x'mas :)

p.s. if i found some errors later, should i keep bug reporting to
http://code.google.com/p/chromium/issues/list?can=2&q=git+cl&colspec=ID+Stars...

ks.


>
>
> http://codereview.chromium.org/5012006/
>



-- 
Please do not send me Microsoft Office/Apple iWork documents. Send
OpenDocument (.pdf, .odt, .ods, .odp, etc.) instead!

http://fsf.org/campaigns/opendocument/

[chase, 2010-12-24 07:39:39]

On 2010/12/24 07:32:24, mr.kschan wrote:
> For your info, i was using the git-cl copy from
>
http://git.chromium.org/gitweb/?p=git-cl.git;a=commit;h=c3f0433a0e6520297950c...
> i believe it should be stale now.

Ok.  I imagine we will deprecate that repo sometime soon, too.

> Anyway, i will try out git-cl with the svn HEAD sooner or later.

Sounds good, let me know how that goes.

> merry x'mas :)

Same to you!

> p.s. if i found some errors later, should i keep bug reporting to
>
http://code.google.com/p/chromium/issues/list?can=2&q=git+cl&colspec=ID+Stars...

Filing a bug there (in the chromium project) would be a good way to let us know.
 Be sure to cc me on it.