Title: [158828] trunk/Tools
- Revision
- 158828
- Author
- [email protected]
- Date
- 2013-11-07 01:21:08 -0800 (Thu, 07 Nov 2013)
Log 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 <[email protected]> on 2013-11-07
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/common/checkout/scm/git.py:
(Git.git_commit_from_svn_revision):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (158827 => 158828)
--- trunk/Tools/ChangeLog 2013-11-07 08:05:06 UTC (rev 158827)
+++ trunk/Tools/ChangeLog 2013-11-07 09:21:08 UTC (rev 158828)
@@ -1,3 +1,13 @@
+2013-11-07 Peter Molnar <[email protected]>
+
+ 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 <[email protected]>
Unreviewed webkitpy unit test fix; update baselines after r158765
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (158827 => 158828)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2013-11-07 08:05:06 UTC (rev 158827)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2013-11-07 09:21:08 UTC (rev 158828)
@@ -310,14 +310,12 @@
@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
def svn_revision_from_git_commit(self, git_commit):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
