diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/common/checkout/scm')
5 files changed, 10 insertions, 8 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 "" diff --git a/Tools/Scripts/webkitpy/common/checkout/scm/scm.py b/Tools/Scripts/webkitpy/common/checkout/scm/scm.py index 4b581b17f..432d6ca99 100644 --- a/Tools/Scripts/webkitpy/common/checkout/scm/scm.py +++ b/Tools/Scripts/webkitpy/common/checkout/scm/scm.py @@ -182,6 +182,9 @@ class SCM: self._subclass_must_implement() def head_svn_revision(self): + return self.svn_revision(self.checkout_root) + + def svn_revision(self, path): self._subclass_must_implement() def create_patch(self, git_commit=None, changed_files=None): diff --git a/Tools/Scripts/webkitpy/common/checkout/scm/scm_mock.py b/Tools/Scripts/webkitpy/common/checkout/scm/scm_mock.py index 78af67c98..f203cfa1a 100644 --- a/Tools/Scripts/webkitpy/common/checkout/scm/scm_mock.py +++ b/Tools/Scripts/webkitpy/common/checkout/scm/scm_mock.py @@ -68,6 +68,9 @@ class MockSCM(object): def head_svn_revision(self): return 1234 + def svn_revision(self, path): + return 5678 + def create_patch(self, git_commit, changed_files=None): return "Patch1" diff --git a/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py b/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py index 209bd3510..b835cdf67 100644 --- a/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py +++ b/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py @@ -28,8 +28,6 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from __future__ import with_statement - import atexit import base64 import codecs diff --git a/Tools/Scripts/webkitpy/common/checkout/scm/svn.py b/Tools/Scripts/webkitpy/common/checkout/scm/svn.py index 3f583a7d3..edeee30ae 100644 --- a/Tools/Scripts/webkitpy/common/checkout/scm/svn.py +++ b/Tools/Scripts/webkitpy/common/checkout/scm/svn.py @@ -36,7 +36,6 @@ import sys 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 .scm import AuthenticationError, SCM, commit_error_handler @@ -237,8 +236,8 @@ class SVN(SCM, SVNRepository): def display_name(self): return "svn" - def head_svn_revision(self): - return self.value_from_svn_info(self.checkout_root, 'Revision') + def svn_revision(self, path): + return self.value_from_svn_info(path, 'Revision') # FIXME: This method should be on Checkout. def create_patch(self, git_commit=None, changed_files=None): |