Merge scm.py and git.py in webkitpy.

Merge scm.py and git.py in webkitpy.

This is something which I've wanted to do for a while,
since the Blink codebase is merged into Chromium and
Chromium is git-only.

The purpose of this change is to make it a little simpler
and easier to change or use SCM methods in webkitpy in
the future.

In this CL:
 - Remove scm.py, merge scm.py and git.py
 - Move scm_mock.py -> git_mock.py
 - Move scm_unittest.py -> git_unittest.py
 - Simplify git.py, git_mock.py.
 - Clean up and improve coverage for git_unittest.py.

Follow-ups that I think should be done after this:
 - Remove SCM detection code.
 - Rename scm -> git everywhere.
 - Move git.py and unit test into webkitpy/common/.
 - Refactor SCM initialization code in Host.
 - Move Windows-only git initialization from Host.

BUG=676012
Review-Url: https://codereview.chromium.org/2594513003
Cr-Commit-Position: refs/heads/master@{#442291}
Committed: https://chromium.googlesource.com/chromium/src/+/ad16c9d3694d24a3ed6c1eab71a567d1094d99f7

[qyearsley, 2016-12-20 19:16:46]

Description was changed from

==========
Merge scm.py and git.py in webkitpy.

Since the Blink codebase is merged into Chromium and Chromium is git-only
now, we can simplify SCM-related code in webkitpy, which will make the
code easier to work with in the future.

In this CL:
 - Remove scm.py, merge scm.py and git.py
 - Move scm_mock.py -> git_mock.py
 - Move scm_unittest.py -> git_unittest.py
 - Simplify git.py, git_mock.py.
 - Clean up and improve coverage for git_unittest.py.

BUG=676012
==========

to

==========
Merge scm.py and git.py in webkitpy.

This is something which I've wanted to do for a while,
since the Blink codebase is merged into Chromium and
Chromium is git-only.

The purpose of this change is to make it a little simpler
and easier to change or use SCM methods in webkitpy in
the future.

In this CL:
 - Remove scm.py, merge scm.py and git.py
 - Move scm_mock.py -> git_mock.py
 - Move scm_unittest.py -> git_unittest.py
 - Simplify git.py, git_mock.py.
 - Clean up and improve coverage for git_unittest.py.

Follow-ups that I think should be done after this:
 - Remove SCM detection code.
 - Rename scm -> git everywhere.
 - Move git.py and unit test into webkitpy/common/.
 - Refactor SCM initialization code in Host.
 - Move Windows-only git initialization from Host.

BUG=676012
==========

[qyearsley, 2016-12-20 19:16:46]

qyearsley@chromium.org changed reviewers:
+ dpranke@chromium.org, ojan@chromium.org

[qyearsley, 2016-12-20 19:20:24]

https://codereview.chromium.org/2594513003/diff/1/third_party/WebKit/Tools/Sc...
File
third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git_unittest.py
(right):

https://codereview.chromium.org/2594513003/diff/1/third_party/WebKit/Tools/Sc...
third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git_unittest.py:78:
def test_add_list(self):
These methods (test_add_list, test_delete*, test_exists, test_move*) were
previously not run; they can be run and pass with minor tweaking. Compared to
other test methods they may be slower, since they involve creating real git
repos and writing real files -- although I'm not sure whether this is an issue.

[qyearsley, 2016-12-20 22:23:52]

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

[commit-bot: I haz the power, 2016-12-20 22:24:38]

Dry run: 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-12-20 23:45:14]

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

[commit-bot: I haz the power, 2016-12-20 23:45:15]

Dry run: This issue passed the CQ dry run.

[qyearsley, 2016-12-28 02:49:03]

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

[commit-bot: I haz the power, 2016-12-28 02:49:16]

Dry run: 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-12-28 03:50:12]

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

[commit-bot: I haz the power, 2016-12-28 03:50:15]

Dry run: This issue passed the CQ dry run.

[qyearsley, 2017-01-03 22:22:15]

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

[commit-bot: I haz the power, 2017-01-03 22:22:50]

Dry run: 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, 2017-01-03 23:36:45]

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

[commit-bot: I haz the power, 2017-01-03 23:36:46]

Dry run: This issue passed the CQ dry run.

[qyearsley, 2017-01-05 21:23:26]

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

[commit-bot: I haz the power, 2017-01-05 21:23:54]

Dry run: 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, 2017-01-05 22:50:40]

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

[commit-bot: I haz the power, 2017-01-05 22:50:41]

Dry run: This issue passed the CQ dry run.

[qyearsley, 2017-01-05 23:44:52]

On 2016/12/20 at 19:20:24, qyearsley wrote:
>
https://codereview.chromium.org/2594513003/diff/1/third_party/WebKit/Tools/Sc...
> File
third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git_unittest.py
(right):
> 
>
https://codereview.chromium.org/2594513003/diff/1/third_party/WebKit/Tools/Sc...
>
third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git_unittest.py:78:
def test_add_list(self):
> These methods (test_add_list, test_delete*, test_exists, test_move*) were
previously not run; they can be run and pass with minor tweaking. Compared to
other test methods they may be slower, since they involve creating real git
repos and writing real files -- although I'm not sure whether this is an issue.

Note, this (non-urgent) CL is ready for review. Does the overall idea seem OK?

[Dirk Pranke, 2017-01-09 04:44:52]

lgtm.

https://codereview.chromium.org/2594513003/diff/1/third_party/WebKit/Tools/Sc...
File
third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git_unittest.py
(right):

https://codereview.chromium.org/2594513003/diff/1/third_party/WebKit/Tools/Sc...
third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git_unittest.py:78:
def test_add_list(self):
On 2016/12/20 19:20:24, qyearsley wrote:
> These methods (test_add_list, test_delete*, test_exists, test_move*) were
> previously not run; they can be run and pass with minor tweaking. Compared to
> other test methods they may be slower, since they involve creating real git
> repos and writing real files -- although I'm not sure whether this is an
issue.

Right. First, we normally don't want tests actually reading and writing stuff
from the filesystem if we can help it. Second, we want things to be fast.

However, if memory serves, most of the slowness was in svn and git+svn, not pure
git. It might be that the pure-git stuff is fast enough that we don't care, in
which case more coverage is better than less.

[qyearsley, 2017-01-09 17:08:21]

The CQ bit was checked by qyearsley@chromium.org

[commit-bot: I haz the power, 2017-01-09 17:08:46]

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, 2017-01-09 18:09:22]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1483981701942890,
"parent_rev": "f115664eb4b48daa35590c365d7db577f3514c0c", "commit_rev":
"ad16c9d3694d24a3ed6c1eab71a567d1094d99f7"}

[commit-bot: I haz the power, 2017-01-09 18:09:54]

Description was changed from

==========
Merge scm.py and git.py in webkitpy.

This is something which I've wanted to do for a while,
since the Blink codebase is merged into Chromium and
Chromium is git-only.

The purpose of this change is to make it a little simpler
and easier to change or use SCM methods in webkitpy in
the future.

In this CL:
 - Remove scm.py, merge scm.py and git.py
 - Move scm_mock.py -> git_mock.py
 - Move scm_unittest.py -> git_unittest.py
 - Simplify git.py, git_mock.py.
 - Clean up and improve coverage for git_unittest.py.

Follow-ups that I think should be done after this:
 - Remove SCM detection code.
 - Rename scm -> git everywhere.
 - Move git.py and unit test into webkitpy/common/.
 - Refactor SCM initialization code in Host.
 - Move Windows-only git initialization from Host.

BUG=676012
==========

to

==========
Merge scm.py and git.py in webkitpy.

This is something which I've wanted to do for a while,
since the Blink codebase is merged into Chromium and
Chromium is git-only.

The purpose of this change is to make it a little simpler
and easier to change or use SCM methods in webkitpy in
the future.

In this CL:
 - Remove scm.py, merge scm.py and git.py
 - Move scm_mock.py -> git_mock.py
 - Move scm_unittest.py -> git_unittest.py
 - Simplify git.py, git_mock.py.
 - Clean up and improve coverage for git_unittest.py.

Follow-ups that I think should be done after this:
 - Remove SCM detection code.
 - Rename scm -> git everywhere.
 - Move git.py and unit test into webkitpy/common/.
 - Refactor SCM initialization code in Host.
 - Move Windows-only git initialization from Host.

BUG=676012

Review-Url: https://codereview.chromium.org/2594513003
Cr-Commit-Position: refs/heads/master@{#442291}
Committed:
https://chromium.googlesource.com/chromium/src/+/ad16c9d3694d24a3ed6c1eab71a5...
==========

[commit-bot: I haz the power, 2017-01-09 18:09:55]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/ad16c9d3694d24a3ed6c1eab71a5...