git recipe_module: git new-branch.

git recipe_module: git new-branch.

R=iannucci@chromium.org,qyearsley@chromium.org
BUG=

Committed: https://chromium.googlesource.com/chromium/tools/depot_tools/+/bef52ff000b949db4e9e3d80d0d5b7ad3f9ba964

[tandrii(chromium), 2016-09-26 16:20:54]

The CQ bit was checked by tandrii@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-26 16:20:57]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[tandrii(chromium), 2016-09-26 16:21:47]

PTAL

[commit-bot: I haz the power, 2016-09-26 16:24:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-26 16:24:06]

Dry run: This issue passed the CQ dry run.

[qyearsley, 2016-09-26 16:33:14]

General question: What's the disadvantage of `git checkout -B <name>
origin/master` vs git new-branch?

https://codereview.chromium.org/2369073002/diff/1/recipe_modules/git/api.py
File recipe_modules/git/api.py (right):

https://codereview.chromium.org/2369073002/diff/1/recipe_modules/git/api.py#n...
recipe_modules/git/api.py:419: upstream: to origin/master.
(1) "to origin/master" -> "upstream branch name, defaults to origin/master".
Question: is it correct to call "origin/master" a branch?

(2) To be consistent with other docstrings above you could note that three args
are expected to be strings, and that kwargs is passed on to __call__.

https://codereview.chromium.org/2369073002/diff/1/recipe_modules/git/api.py#n...
recipe_modules/git/api.py:423: str(self.package_repo_resource()), '%(PATH)s'])
I guess that this is required because git-new-branch is in depot_tools? But no
comment is necessary for this.

[tandrii(chromium), 2016-09-26 16:49:56]

git-new branch sets a few more properties:

[branch "test-checkout-b"]
        remote = origin
        merge = refs/heads/master
        rebase = true
[branch "test-new-branch"]
        remote = origin
        merge = refs/heads/master
        rebase = true
        base = ff84560ede8fbc53160a760c0284c0234eaeeff1
        base-upstream = origin/master

https://codereview.chromium.org/2369073002/diff/1/recipe_modules/git/api.py
File recipe_modules/git/api.py (right):

https://codereview.chromium.org/2369073002/diff/1/recipe_modules/git/api.py#n...
recipe_modules/git/api.py:419: upstream: to origin/master.
On 2016/09/26 16:33:14, qyearsley wrote:
> (1) "to origin/master" -> "upstream branch name, defaults to origin/master".
> Question: is it correct to call "origin/master" a branch?
I think so, as it's shown when you do $ git branch -a
That said, you can specify any refspec here, but let's not confuse users.
 
> (2) To be consistent with other docstrings above you could note that three
args
> are expected to be strings, and that kwargs is passed on to __call__.
Done.

https://codereview.chromium.org/2369073002/diff/1/recipe_modules/git/api.py#n...
recipe_modules/git/api.py:423: str(self.package_repo_resource()), '%(PATH)s'])
On 2016/09/26 16:33:14, qyearsley wrote:
> I guess that this is required because git-new-branch is in depot_tools? But no
> comment is necessary for this.

yep

[tandrii(chromium), 2016-09-26 16:51:13]

On 2016/09/26 16:49:56, tandrii(chromium) wrote:
> git-new branch sets a few more properties:
> 
> [branch "test-checkout-b"]
>         remote = origin
>         merge = refs/heads/master
>         rebase = true
> [branch "test-new-branch"]
>         remote = origin
>         merge = refs/heads/master
>         rebase = true
>         base = ff84560ede8fbc53160a760c0284c0234eaeeff1
>         base-upstream = origin/master

And that is sometimes affecting git cl upload, though I don't yet fully
comprehend why and when exactly. So, I'm going the safe route.

[qyearsley, 2016-09-26 16:55:38]

On 2016/09/26 at 16:51:13, tandrii wrote:
> On 2016/09/26 16:49:56, tandrii(chromium) wrote:
> > git-new branch sets a few more properties:
> > 
> > [branch "test-checkout-b"]
> >         remote = origin
> >         merge = refs/heads/master
> >         rebase = true
> > [branch "test-new-branch"]
> >         remote = origin
> >         merge = refs/heads/master
> >         rebase = true
> >         base = ff84560ede8fbc53160a760c0284c0234eaeeff1
> >         base-upstream = origin/master
> 
> And that is sometimes affecting git cl upload, though I don't yet fully
comprehend why and when exactly. So, I'm going the safe route.

Sounds good, LGTM

[tandrii(chromium), 2016-09-26 17:01:27]

Robbie, I'm landing as is to unblock Quinten, but if you have comments, I'll
create follow up CL.

[tandrii(chromium), 2016-09-26 17:01:33]

The CQ bit was checked by tandrii@chromium.org

[commit-bot: I haz the power, 2016-09-26 17:01:36]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-26 17:04:56]

Description was changed from

==========
git recipe_module: git new-branch.

R=iannucci@chromium.org,qyearsley@chromium.org
BUG=
==========

to

==========
git recipe_module: git new-branch.

R=iannucci@chromium.org,qyearsley@chromium.org
BUG=

Committed:
https://chromium.googlesource.com/chromium/tools/depot_tools/+/bef52ff000b949...
==========

[commit-bot: I haz the power, 2016-09-26 17:04:57]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/tools/depot_tools/+/bef52ff000b949...