Fix resolution of local branch name in scm and rebaseline tools.

Fix resolution of local branch name in scm and rebaseline tools.

This was failing due to the newline at the end of the branch name.

Also replaced the git command in current_branch() used in the scm tool with the version that doesn't crash when on detached head.

BUG=510146
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=199181

[joelo, 2015-07-15 20:54:41]

joelo@chromium.org changed reviewers:
+ jsbell@chromium.org, wangxianzhu@chromium.org

[joelo, 2015-07-15 20:54:41]

ptal?

[Xianzhu, 2015-07-15 21:16:58]

https://codereview.chromium.org/1235353002/diff/1/Tools/Scripts/webkitpy/tool...
File Tools/Scripts/webkitpy/tool/commands/rebaseline.py (right):

https://codereview.chromium.org/1235353002/diff/1/Tools/Scripts/webkitpy/tool...
Tools/Scripts/webkitpy/tool/commands/rebaseline.py:846: ["git", "rev-parse",
"--symbolic-full-name", "HEAD"]).strip()
If scm.current_branch() had problem we should fix it instead of fixing it here.

We also need to fix another place calling current_branch() in this file.

[joelo, 2015-07-16 21:48:48]

Thanks, @wangxianzhu. ptal?

https://codereview.chromium.org/1235353002/diff/1/Tools/Scripts/webkitpy/tool...
File Tools/Scripts/webkitpy/tool/commands/rebaseline.py (right):

https://codereview.chromium.org/1235353002/diff/1/Tools/Scripts/webkitpy/tool...
Tools/Scripts/webkitpy/tool/commands/rebaseline.py:846: ["git", "rev-parse",
"--symbolic-full-name", "HEAD"]).strip()
On 2015/07/15 21:16:58, Xianzhu wrote:
> If scm.current_branch() had problem we should fix it instead of fixing it
here.
> 
> We also need to fix another place calling current_branch() in this file.

Done.

[Xianzhu, 2015-07-16 22:01:20]

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
File Tools/Scripts/webkitpy/common/checkout/scm/git.py (right):

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/common/checkout/scm/git.py:137: # Returns an empty string
if HEAD is detached.
The following code will return 'HEAD' when HEAD is detached, right?

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
File Tools/Scripts/webkitpy/tool/commands/rebaseline.py (right):

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/tool/commands/rebaseline.py:846: if not old_branch_name:
Why don't use the same method as for rebaseline-o-matic?

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/tool/commands/rebaseline.py:848: old_branch_name =
tool.executive.run_command(["git", "rev-parse", "HEAD"]).strip()
Should use single quotes to keep consistency.

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/tool/commands/rebaseline.py:947: "Rebaseline-o-matic
cannot be run from a branch with a detached HEAD.")
Ditto.

[joelo, 2015-07-16 23:00:12]

ptal :)

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
File Tools/Scripts/webkitpy/common/checkout/scm/git.py (right):

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/common/checkout/scm/git.py:137: # Returns an empty string
if HEAD is detached.
On 2015/07/16 22:01:19, Xianzhu wrote:
> The following code will return 'HEAD' when HEAD is detached, right?

Whoops, you're right. I meant to check for that and convert it to an empty
string.

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
File Tools/Scripts/webkitpy/tool/commands/rebaseline.py (right):

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/tool/commands/rebaseline.py:846: if not old_branch_name:
On 2015/07/16 22:01:19, Xianzhu wrote:
> Why don't use the same method as for rebaseline-o-matic?

I'm not quite sure what you mean by this. I changed rebaseline-o-matic to also
use the commit SHA if HEAD is detached, does that work? Keep in mind that
rebaseline-o-matic below is going away as soon as I figure out how to get it
running on buildbot.

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/tool/commands/rebaseline.py:848: old_branch_name =
tool.executive.run_command(["git", "rev-parse", "HEAD"]).strip()
On 2015/07/16 22:01:19, Xianzhu wrote:
> Should use single quotes to keep consistency.

Done. Sorry, this file is not consistent at all.

[Xianzhu, 2015-07-16 23:21:39]

lgtm.

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
File Tools/Scripts/webkitpy/tool/commands/rebaseline.py (right):

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/tool/commands/rebaseline.py:846: if not old_branch_name:
On 2015/07/16 23:00:11, joelo wrote:
> On 2015/07/16 22:01:19, Xianzhu wrote:
> > Why don't use the same method as for rebaseline-o-matic?
> 
> I'm not quite sure what you mean by this. I changed rebaseline-o-matic to also
> use the commit SHA if HEAD is detached, does that work? Keep in mind that
> rebaseline-o-matic below is going away as soon as I figure out how to get it
> running on buildbot.

I was just wondering why rebaseline-o-matic asserts while this function tries to
tolerate detached head. Either way is fine. Anyway this doesn't really matter
because you'll remove rebaseline-o-matic.

https://codereview.chromium.org/1235353002/diff/40001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/tool/commands/rebaseline.py:848: old_branch_name =
tool.executive.run_command(["git", "rev-parse", "HEAD"]).strip()
On 2015/07/16 23:00:11, joelo wrote:
> On 2015/07/16 22:01:19, Xianzhu wrote:
> > Should use single quotes to keep consistency.
> 
> Done. Sorry, this file is not consistent at all.

Never mind. I didn't notice the inconsistency.

[joelo, 2015-07-20 18:09:02]

The CQ bit was checked by joelo@chromium.org

[commit-bot: I haz the power, 2015-07-20 18:09:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1235353002/60001

[commit-bot: I haz the power, 2015-07-20 19:23:51]

Committed patchset #4 (id:60001) as
https://src.chromium.org/viewvc/blink?view=rev&revision=199181