diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
| commit | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (patch) | |
| tree | 52599cd0ab782b1768e23ad176f7618f98333cb6 /Tools/Scripts/webkitpy/common/checkout/scm/git.py | |
| parent | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (diff) | |
| download | qtwebkit-03e12282df9aa1e1fb05a8b90f1cfc2e08764cec.tar.gz | |
Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)
Diffstat (limited to 'Tools/Scripts/webkitpy/common/checkout/scm/git.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/common/checkout/scm/git.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Tools/Scripts/webkitpy/common/checkout/scm/git.py b/Tools/Scripts/webkitpy/common/checkout/scm/git.py index 866b24cc4..ab96b8fa7 100644 --- a/Tools/Scripts/webkitpy/common/checkout/scm/git.py +++ b/Tools/Scripts/webkitpy/common/checkout/scm/git.py @@ -34,7 +34,6 @@ import re from webkitpy.common.memoized import memoized from webkitpy.common.system.deprecated_logging import log from webkitpy.common.system.executive import Executive, ScriptError -from webkitpy.common.system import ospath from .commitmessage import CommitMessage from .scm import AuthenticationError, SCM, commit_error_handler @@ -229,9 +228,9 @@ class Git(SCM, SVNRepository): def display_name(self): return "git" - def head_svn_revision(self): + def svn_revision(self, path): _log.debug('Running git.head_svn_revision... (Temporary logging message)') - git_log = self.run(['git', 'log', '-25']) + git_log = self.run(['git', 'log', '-25', path]) match = re.search("^\s*git-svn-id:.*@(?P<svn_revision>\d+)\ ", git_log, re.MULTILINE) if not match: return "" |