Changeset 232605 in webkit

Timestamp:

Jun 7, 2018 4:15:41 PM (6 years ago)

Author:

Jonathan Bedard

Message:

[webkitpy] Treat svn versions as Version objects
​https://bugs.webkit.org/show_bug.cgi?id=186403
<rdar://problem/40904860>

Reviewed by Dan Bernstein.

• Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
• Scripts/webkitpy/common/checkout/scm/svn.py:

(SVN.svn_version): Return Version object instead of string.
(SVN._status_regexp): Convert version string to Version object.
(SVN.add_list): Ditto.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/scm_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/common/checkout/scm/svn.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-06-07  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Treat svn versions as Version objects
+        https://bugs.webkit.org/show_bug.cgi?id=186403
+        <rdar://problem/40904860>
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+        * Scripts/webkitpy/common/checkout/scm/svn.py:
+        (SVN.svn_version): Return Version object instead of string.
+        (SVN._status_regexp): Convert version string to Version object.
+        (SVN.add_list): Ditto.
+
 2018-06-07  Tadeu Zagallo  <tzagallo@apple.com>
 

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

@@ -53 +53 @@
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.executive_mock import MockExecutive
+from webkitpy.common.version import Version
 from .git import Git, AmbiguousCommitError
 from .detection import detect_scm_system
@@ -954 +955 @@
 
     def test_svn_lock(self):
-        if self.scm.svn_version() >= "1.7":
+        if self.scm.svn_version() >= Version(1, 7):
             # the following technique with .svn/lock then svn update doesn't work with subversion client 1.7 or later
             pass

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

@@ -41 +41 @@
 from webkitpy.common.system.executive import Executive, ScriptError
 from webkitpy.common.webkit_finder import WebKitFinder
+from webkitpy.common.version import Version
 
 from .scm import AuthenticationError, SCM, commit_error_handler
@@ -140 +141 @@
     @memoized
     def svn_version(self):
-        return self._run_svn(['--version', '--quiet'])
+        return Version.from_string(self._run_svn(['--version', '--quiet']))
 
     def has_working_directory_changes(self):
@@ -184 +185 @@
 
     def _status_regexp(self, expected_types):
-        field_count = 6 if self.svn_version() > "1.6" else 5
+        field_count = 6 if self.svn_version() > Version(1, 6) else 5
         return "^(?P<status>[%s]).{%s} (?P<filename>.+)$" % (expected_types, field_count)
 
@@ -196 +197 @@
         for path in paths:
             self._add_parent_directories(os.path.dirname(os.path.abspath(path)))
-        if self.svn_version() >= "1.7":
+        if self.svn_version() >= Version(1, 7):
             # For subversion client 1.7 and later, need to add '--parents' option to ensure intermediate directories
             # are added; in addition, 1.7 returns an exit code of 1 from svn add if one or more of the requested