Add --gerrit_no_reset for who need to use FETCH_HEAD revision.

Add --gerrit_no_reset for who need to use FETCH_HEAD revision.

Avoid to call git reset --soft to preserve current revision to
FETCH_HEAD.  'got_revision' property would also be that from
FETCH_HEAD.

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

[Yoshisato Yanagisawa, 2016-03-25 07:45:47]

yyanagisawa@chromium.org changed reviewers:
+ hinoka@chromium.org, tandrii@chromium.org

[Yoshisato Yanagisawa, 2016-03-25 07:45:47]

Hi,

Let me add new option not to reset --soft.
The option is disabled by default to preserve the current bot_update behavior.

Thanks,

[hinoka, 2016-03-25 12:48:17]

I think it's super unfortunate the we have to add yet another flag, but it looks
like whoever is using the gerrit_ref flags before needed the soft reset
behavior:

https://codereview.chromium.org/1387213002

https://codereview.chromium.org/1837453002/diff/1/recipe_modules/bot_update/r...
File recipe_modules/bot_update/resources/bot_update.py (right):

https://codereview.chromium.org/1837453002/diff/1/recipe_modules/bot_update/r...
recipe_modules/bot_update/resources/bot_update.py:1140: if not reset_soft:
if reset_soft:

https://codereview.chromium.org/1837453002/diff/1/recipe_modules/bot_update/r...
recipe_modules/bot_update/resources/bot_update.py:1497: help='Bypass calling
reset --soft after git fetch.')
I think the name "--gerrit_no_reset" is better, since this only applies to
gerrit refs (And not rietveld patches).

s/after git fetch/after applying a gerrit ref/

Also move this option up next to L1444, next to the other gerrit flags.

[Yoshisato Yanagisawa, 2016-03-28 02:00:18]

Description was changed from

==========
Add --no_soft_reset for who need to use FETCH_HEAD revision.

Avoid to call git reset --soft to preserve current revision to
FETCH_HEAD.  'got_revision' property would also be that from
FETCH_HEAD.

BUG=596787
==========

to

==========
Add --gerrit_no_reset for who need to use FETCH_HEAD revision.

Avoid to call git reset --soft to preserve current revision to
FETCH_HEAD.  'got_revision' property would also be that from
FETCH_HEAD.

BUG=596787
==========

[Yoshisato Yanagisawa, 2016-03-28 02:00:52]

thanks for the review.

https://codereview.chromium.org/1837453002/diff/1/recipe_modules/bot_update/r...
File recipe_modules/bot_update/resources/bot_update.py (right):

https://codereview.chromium.org/1837453002/diff/1/recipe_modules/bot_update/r...
recipe_modules/bot_update/resources/bot_update.py:1140: if not reset_soft:
On 2016/03/25 12:48:17, hinoka wrote:
> if reset_soft:

good catch ;p

https://codereview.chromium.org/1837453002/diff/1/recipe_modules/bot_update/r...
recipe_modules/bot_update/resources/bot_update.py:1497: help='Bypass calling
reset --soft after git fetch.')
On 2016/03/25 12:48:17, hinoka wrote:
> I think the name "--gerrit_no_reset" is better, since this only applies to
> gerrit refs (And not rietveld patches).
> 
> s/after git fetch/after applying a gerrit ref/
> 
> Also move this option up next to L1444, next to the other gerrit flags.

Done.

[Yoshisato Yanagisawa, 2016-03-31 06:35:49]

Do I need more things to do?

[Yoshisato Yanagisawa, 2016-04-05 02:17:37]

ping?

[hinoka, 2016-04-05 17:40:10]

lgtm

[Yoshisato Yanagisawa, 2016-04-06 01:28:11]

The CQ bit was checked by yyanagisawa@chromium.org

[commit-bot: I haz the power, 2016-04-06 01:28:19]

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

[commit-bot: I haz the power, 2016-04-06 01:30:57]

Description was changed from

==========
Add --gerrit_no_reset for who need to use FETCH_HEAD revision.

Avoid to call git reset --soft to preserve current revision to
FETCH_HEAD.  'got_revision' property would also be that from
FETCH_HEAD.

BUG=596787
==========

to

==========
Add --gerrit_no_reset for who need to use FETCH_HEAD revision.

Avoid to call git reset --soft to preserve current revision to
FETCH_HEAD.  'got_revision' property would also be that from
FETCH_HEAD.

BUG=596787

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

[commit-bot: I haz the power, 2016-04-06 01:30:58]

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