Use chromium revision instead of blink svn revision when rebaselining layout tests.

third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py
index 17e2d671ea71049b7191f70ab2a4c8a68a06ce2a..d98c08cf7c4c73e304210d9dfd3b38993b0d8d77 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py
@@ -186,15 +186,18 @@ class Git(SCM):
         # git 1.7.0.4 (and earlier) didn't support the separate arg.
         return self._run_git(['log', '-1', '--grep=' + grep_str, '--date=iso', self.find_checkout_root(path)])
 
-    def svn_revision(self, path):
-        git_log = self.most_recent_log_matching('git-svn-id:', path)
-        match = re.search("^\s*git-svn-id:.*@(?P<svn_revision>\d+)\ ", git_log, re.MULTILINE)
+    def _chromium_revision_from_git_commit_log(self, git_log):

[ojan, 2015/09/29 21:31:54]

nit: _commit_position_from_git_log

[joelo, 2015/09/30 09:46:32]

Done.

+        match = re.search("^\s*Cr-Commit-Position:.*@\{#(?P<chromium_revision>\d+)\}", git_log, re.MULTILINE)
         if not match:
             return ""
-        return str(match.group('svn_revision'))
+        return str(match.group('chromium_revision'))
+
+    def chromium_revision(self, path):

[ojan, 2015/09/29 21:31:54]

s/chromium_revision/commit_position/

[joelo, 2015/09/30 09:46:32]

Done.

+        git_log = self.most_recent_log_matching('Cr-Commit-Position:', path)
+        return self._chromium_revision_from_git_commit_log(git_log)
 
     def timestamp_of_revision(self, path, revision):
-        git_log = self.most_recent_log_matching('git-svn-id:.*@%s' % revision, path)
+        git_log = self.most_recent_log_matching('Cr-Commit-Position:.*@\{%s\}' % revision, path)
         match = re.search("^Date:\s*(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2}) ([+-])(\d{2})(\d{2})$", git_log, re.MULTILINE)
         if not match:
             return ""
@@ -208,13 +211,6 @@ class Git(SCM):
         time_without_timezone = time_with_timezone - datetime.timedelta(hours=sign * int(match.group(8)), minutes=int(match.group(9)))
         return time_without_timezone.strftime('%Y-%m-%dT%H:%M:%SZ')
 
-    def _prepend_svn_revision(self, diff):
-        revision = self._head_svn_revision()
-        if not revision:
-            return diff
-
-        return "Subversion Revision: " + revision + '\n' + diff
-
     def create_patch(self, git_commit=None, changed_files=None):
         """Returns a byte array (str()) representing the patch file.
         Patch files are effectively binary since they may contain
@@ -231,15 +227,12 @@ class Git(SCM):
         command = [self.executable_name, 'diff', '--binary', '--no-color', "--no-ext-diff", "--full-index", "--no-renames", order, self._merge_base(git_commit), "--"]
         if changed_files:
             command += changed_files
-        return self._prepend_svn_revision(self._run(command, decode_output=False, cwd=self.checkout_root))
+        return self._run(command, decode_output=False, cwd=self.checkout_root)
 
     @memoized
-    def svn_revision_from_git_commit(self, git_commit):
-        # git svn find-rev always exits 0, even when the revision or commit is not found.
-        try:
-            return int(self._run_git(['svn', 'find-rev', git_commit]).rstrip())
-        except ValueError, e:
-            return None
+    def chromium_revision_from_git_commit(self, git_commit):

[ojan, 2015/09/29 21:31:54]

s/chromium_revision_*/commit_position_*

[joelo, 2015/09/30 09:46:32]

Done.

+        git_log = self.git_commit_detail(git_commit)
+        return self._chromium_revision_from_git_commit_log(git_log)
 
     def checkout_branch(self, name):
         self._run_git(['checkout', '-q', name])
@@ -263,17 +256,10 @@ class Git(SCM):
 
     def _remote_branch_ref(self):
         # Use references so that we can avoid collisions, e.g. we don't want to operate on refs/heads/trunk if it exists.
-        remote_branch_refs = self.read_git_config('svn-remote.svn.fetch', cwd=self.checkout_root, executive=self._executive)
-        if not remote_branch_refs:
-            remote_master_ref = 'refs/remotes/origin/master'
-            if not self._branch_ref_exists(remote_master_ref):
-                raise ScriptError(message="Can't find a branch to diff against. svn-remote.svn.fetch is not in the git config and %s does not exist" % remote_master_ref)
-            return remote_master_ref
-
-        # FIXME: What's the right behavior when there are multiple svn-remotes listed?
-        # For now, just use the first one.
-        first_remote_branch_ref = remote_branch_refs.split('\n')[0]
-        return first_remote_branch_ref.split(':')[1]
+        remote_master_ref = 'refs/remotes/origin/master'
+        if not self._branch_ref_exists(remote_master_ref):
+            raise ScriptError(message="Can't find a branch to diff against. %s does not exist" % remote_master_ref)
+        return remote_master_ref
 
     def commit_locally_with_message(self, message, commit_all_working_directory_changes=True):
         command = ['commit', '-F', '-']