Changeset 270004 in webkit

Timestamp:

Nov 18, 2020 5:42:45 PM (3 years ago)

Author:

Jonathan Bedard

Message:

[webitscmpy] Branch point incorrect for Git checkouts
​https://bugs.webkit.org/show_bug.cgi?id=219132
<rdar://problem/71561569>

Reviewed by Dewei Zhu.

• Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:

(Git.commit): Banca-point is the distance from the primordial commit minus the distance from
the default branch.

• Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-11-18  Jonathan Bedard  <jbedard@apple.com>
+
+        [webitscmpy] Branch point incorrect for Git checkouts
+        https://bugs.webkit.org/show_bug.cgi?id=219132
+        <rdar://problem/71561569>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+        (Git.commit): Banca-point is the distance from the primordial commit minus the distance from
+        the default branch.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+
 2020-11-18  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py

@@ -47 +47 @@
     )
 
-version = Version(0, 3, 1)
+version = Version(0, 3, 2)
 
 AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil'))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py

@@ -244 +244 @@
         if not identifier:
             identifier = self._commit_count(hash if branch == default_branch else '{}..{}'.format(default_branch, hash))
-        branch_point = None if branch == default_branch else self._commit_count(hash)
+        branch_point = None if branch == default_branch else self._commit_count(hash) - identifier
         if branch_point and parsed_branch_point and branch_point != parsed_branch_point:
             raise ValueError("Provided 'branch_point' does not match branch point of specified branch")

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py

@@ -352 +352 @@
         if '..' in something or not match.branch_point:
             return match.identifier
-        return match.branch_point
+        return match.branch_point + match.identifier
 
     def branches_on(self, hash):