Changeset 158828 in webkit

Timestamp:

Nov 7, 2013 1:21:08 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Change git_commit_from_svn_revision() to work in a pure git checkout
​https://bugs.webkit.org/show_bug.cgi?id=111668

Patch by Peter Molnar <​pmolnar.u-szeged@partner.samsung.com> on 2013-11-07
Reviewed by Ryosuke Niwa.

• Scripts/webkitpy/common/checkout/scm/git.py:

(Git.git_commit_from_svn_revision):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/git.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-11-07  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Change git_commit_from_svn_revision() to work in a pure git checkout
+        https://bugs.webkit.org/show_bug.cgi?id=111668
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/webkitpy/common/checkout/scm/git.py:
+        (Git.git_commit_from_svn_revision):
+
 2013-11-06  Jer Noble  <jer.noble@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py

@@ -311 +311 @@
     @memoized
     def git_commit_from_svn_revision(self, svn_revision):
-        # FIXME: https://bugs.webkit.org/show_bug.cgi?id=111668
-        # We should change this to run git log --grep 'git-svn-id' instead
-        # so that we don't require git+svn to be set up.
-        git_commit = self._run_git_svn_find_rev('r%s' % svn_revision)
+        git_log = self._run_git(['log', '-1', '--grep=^\s*git-svn-id:.*@%s ' % svn_revision])
+        git_commit = re.search("^commit (?P<commit>[a-f0-9]{40})", git_log)
         if not git_commit:
             # FIXME: Alternatively we could offer to update the checkout? Or return None?
             raise ScriptError(message='Failed to find git commit for revision %s, your checkout likely needs an update.' % svn_revision)
-        return git_commit
+        return str(git_commit.group('commit'))
 
     @memoized