Changeset 175717 in webkit

Timestamp:

Nov 6, 2014 2:41:31 PM (9 years ago)

Author:

matthew_hanson@apple.com

Message:

Remove code that prepends a leading 'r' to the first argument of _run_git_svn_find_rev
​https://bugs.webkit.org/show_bug.cgi?id=138475

Reviewed by Ryosuke Niwa.

The change in ​https://trac.webkit.org/175603 introduced broke compatibility with svn_revision_from_git_commit.
This patch reverts the part of that change that broke compatibility. In addition, this patch adds a comment to
explain that SVN revisions require a leading 'r', moves an existing comment to a more appropriate location and
renames the positional argument to better reflect that it can represent either an SVN revision or a Git tree-ish.

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

(Git._run_git_svn_find_rev):
Add comment mentioning that svn_revisions need to begin with 'r'.
Move comment (explaining that git svn find-rev exits with code 0 when no match is found) to a more appropriate location.
Rename the argument 'revision' to 'revision_or_treeish' to reflect the dual form that argument can take.
Remove code that coerced the revision/treeish into a string and prepended an 'r'.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-06  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Remove code that prepends a leading 'r' to the first argument of _run_git_svn_find_rev
+        https://bugs.webkit.org/show_bug.cgi?id=138475
+
+        Reviewed by Ryosuke Niwa.
+
+        The change in https://trac.webkit.org/175603 introduced broke compatibility with svn_revision_from_git_commit.
+        This patch reverts the part of that change that broke compatibility. In addition, this patch adds a comment to
+        explain that SVN revisions require a leading 'r', moves an existing comment to a more appropriate location and
+        renames the positional argument to better reflect that it can represent either an SVN revision or a Git tree-ish.
+
+        * Scripts/webkitpy/common/checkout/scm/git.py:
+        (Git._run_git_svn_find_rev):
+        Add comment mentioning that svn_revisions need to begin with 'r'.
+        Move comment (explaining that git svn find-rev exits with code 0 when no match is found) to a more appropriate location.
+        Rename the argument 'revision' to 'revision_or_treeish' to reflect the dual form that argument can take.
+        Remove code that coerced the revision/treeish into a string and prepended an 'r'.
+
 2014-11-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -324 +324 @@
         return self.prepend_svn_revision(self.run(command, decode_output=False, cwd=self.checkout_root))
 
-    def _run_git_svn_find_rev(self, revision, branch=None):
-        revision = str(revision)
-        if revision and revision[0] != 'r':
-            revision = 'r' + revision
-
-        # git svn find-rev always exits 0, even when the revision or commit is not found.
-        command = ['svn', 'find-rev', revision]
+    def _run_git_svn_find_rev(self, revision_or_treeish, branch=None):
+        # git svn find-rev requires SVN revisions to begin with the character 'r'.
+        command = ['svn', 'find-rev', revision_or_treeish]
         if branch:
             command.append(branch)
 
+        # git svn find-rev always exits 0, even when the revision or commit is not found.
         return self._run_git(command).rstrip()