git cl: add --gerrit and --rietveld options to force codereview.

git cl: add --gerrit and --rietveld options to force codereview.

This makes it possible to override the codereview set in:
 * repository codereview.settings
 * cached/set in local .git/config, either repo-wide or
   current branch only.

Examples:

    cd $SOME_RIETVELD_USING_REPO
    # Enable Gerrit codereview on it. Contact Infra-Git admin:
    # https://bugs.chromium.org/p/chromium/issues/entry?template=Infra-Git

    # Uploading
    git cl upload --gerrit --squash
    # Hack, hack, re-upload uses Gerrit automatically.
    git cl upload --squash

    # Patching
    git new-branch patched-in-issue
    git cl patch --gerrit XXXXXX

    # (Re-)setting issue
    git cl issue --gerrit 0
    git cl issue --gerrit XXXXXX

R=andybons@chromium.org,sergiyb@chromium.org
BUG=598681
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299901

[tandrii(chromium), 2016-04-13 16:41:14]

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

[commit-bot: I haz the power, 2016-04-13 16:41:22]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1880243003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1880243003/1

[commit-bot: I haz the power, 2016-04-13 16:43:53]

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

[commit-bot: I haz the power, 2016-04-13 16:43:54]

Dry run: This issue passed the CQ dry run.

[tandrii(chromium), 2016-04-13 16:44:20]

PTAL

This Gerrit CL was uploaded this way for infra/infra repo:
https://chromium-review.googlesource.com/#/c/338811/2

[Bons, 2016-04-13 17:00:39]

lgtm

[tandrii(chromium), 2016-04-13 17:08:10]

The CQ bit was checked by tandrii@chromium.org

[tandrii(chromium), 2016-04-13 17:08:16]

The CQ bit was unchecked by tandrii@chromium.org

[tandrii(chromium), 2016-04-13 17:08:20]

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

[commit-bot: I haz the power, 2016-04-13 17:08:27]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1880243003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1880243003/1

[tandrii(chromium), 2016-04-13 17:10:00]

The CQ bit was unchecked by tandrii@chromium.org

[tandrii(chromium), 2016-04-13 17:10:03]

The CQ bit was checked by tandrii@chromium.org

[commit-bot: I haz the power, 2016-04-13 17:10:08]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1880243003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1880243003/1

[commit-bot: I haz the power, 2016-04-13 17:11:22]

Description was changed from

==========
git cl: add --gerrit and --rietveld options to force codereview.

This makes it possible to override the codereview set in:
 * repository codereview.settings
 * cached/set in local .git/config, either repo-wide or
   current branch only.

Examples:

    cd $SOME_RIETVELD_USING_REPO
    # Enable Gerrit codereview on it. Contact Infra-Git admin:
    # https://bugs.chromium.org/p/chromium/issues/entry?template=Infra-Git

    # Uploading
    git cl upload --gerrit --squash
    # Hack, hack, re-upload uses Gerrit automatically.
    git cl upload --squash

    # Patching
    git new-branch patched-in-issue
    git cl patch --gerrit XXXXXX

    # (Re-)setting issue
    git cl issue --gerrit 0
    git cl issue --gerrit XXXXXX

R=andybons@chromium.org,sergiyb@chromium.org
BUG=598681
==========

to

==========
git cl: add --gerrit and --rietveld options to force codereview.

This makes it possible to override the codereview set in:
 * repository codereview.settings
 * cached/set in local .git/config, either repo-wide or
   current branch only.

Examples:

    cd $SOME_RIETVELD_USING_REPO
    # Enable Gerrit codereview on it. Contact Infra-Git admin:
    # https://bugs.chromium.org/p/chromium/issues/entry?template=Infra-Git

    # Uploading
    git cl upload --gerrit --squash
    # Hack, hack, re-upload uses Gerrit automatically.
    git cl upload --squash

    # Patching
    git new-branch patched-in-issue
    git cl patch --gerrit XXXXXX

    # (Re-)setting issue
    git cl issue --gerrit 0
    git cl issue --gerrit XXXXXX

R=andybons@chromium.org,sergiyb@chromium.org
BUG=598681

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

[commit-bot: I haz the power, 2016-04-13 17:11:23]

Committed patchset #1 (id:1) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=299901

[Sergiy Byelozyorov, 2016-04-13 17:18:59]

lgtm w/ comment

https://codereview.chromium.org/1880243003/diff/1/tests/git_cl_test.py
File tests/git_cl_test.py (right):

https://codereview.chromium.org/1880243003/diff/1/tests/git_cl_test.py#newcod...
tests/git_cl_test.py:1192: self._patch_common(is_gerrit=True,
force_codereview=True)
can you please try to create mock rietveld CL here and see if we can override it
with --gerrit option?

[tandrii(chromium), 2016-04-13 18:13:46]

https://codereview.chromium.org/1880243003/diff/1/tests/git_cl_test.py
File tests/git_cl_test.py (right):

https://codereview.chromium.org/1880243003/diff/1/tests/git_cl_test.py#newcod...
tests/git_cl_test.py:1129: ((['git', 'config', 'branch.master.rietveldissue'],),
''),
if this line had '12345' at the end, it'd tell git_cl that this is rietveld
issue 12345, and then it'd not even check for gerritissue below.

https://codereview.chromium.org/1880243003/diff/1/tests/git_cl_test.py#newcod...
tests/git_cl_test.py:1192: self._patch_common(is_gerrit=True,
force_codereview=True)
On 2016/04/13 17:18:59, Sergiy Byelozyorov wrote:
> can you please try to create mock rietveld CL here and see if we can override
it
> with --gerrit option?

Ha, good comment/idea! However, the calls below is the *only* way to "git cl
patch" to figure out what's the state of the current branch. And as you can see
in expectations below, it never asks, hence works regardless.

[Sergiy Byelozyorov, 2016-04-13 18:21:55]

https://codereview.chromium.org/1880243003/diff/1/tests/git_cl_test.py
File tests/git_cl_test.py (right):

https://codereview.chromium.org/1880243003/diff/1/tests/git_cl_test.py#newcod...
tests/git_cl_test.py:1192: self._patch_common(is_gerrit=True,
force_codereview=True)
On 2016/04/13 18:13:46, tandrii(chromium) wrote:
> On 2016/04/13 17:18:59, Sergiy Byelozyorov wrote:
> > can you please try to create mock rietveld CL here and see if we can
override
> it
> > with --gerrit option?
> 
> Ha, good comment/idea! However, the calls below is the *only* way to "git cl
> patch" to figure out what's the state of the current branch. And as you can
see
> in expectations below, it never asks, hence works regardless.

Acknowledged.