Title: [270004] trunk/Tools
- Revision
- 270004
- Author
- [email protected]
- Date
- 2020-11-18 17:42:45 -0800 (Wed, 18 Nov 2020)
Log 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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (270003 => 270004)
--- trunk/Tools/ChangeLog 2020-11-19 01:37:37 UTC (rev 270003)
+++ trunk/Tools/ChangeLog 2020-11-19 01:42:45 UTC (rev 270004)
@@ -1,3 +1,16 @@
+2020-11-18 Jonathan Bedard <[email protected]>
+
+ [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 <[email protected]>
Remove IRC bots from webkitpy
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (270003 => 270004)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2020-11-19 01:37:37 UTC (rev 270003)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2020-11-19 01:42:45 UTC (rev 270004)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(0, 3, 1)
+version = Version(0, 3, 2)
AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil'))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (270003 => 270004)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2020-11-19 01:37:37 UTC (rev 270003)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2020-11-19 01:42:45 UTC (rev 270004)
@@ -243,7 +243,7 @@
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")
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py (270003 => 270004)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py 2020-11-19 01:37:37 UTC (rev 270003)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py 2020-11-19 01:42:45 UTC (rev 270004)
@@ -351,7 +351,7 @@
match = self.find(something)
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):
result = set()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
