Changeset 275635 in webkit

Timestamp:

Apr 7, 2021 3:25:20 PM (3 years ago)

Author:

Jonathan Bedard

Message:

[webkitscmpy] Handle multiple double-branch commits
​https://bugs.webkit.org/show_bug.cgi?id=224251
<rdar://problem/76288547>

Reviewed by Dewei Zhu.

There are a few cases, namely on the safari-607-branch, where some commits where made both
on trunk and on a branch. In one notable case, two sequential commits were made this way.

• Scripts/libraries/webkitscmpy/setup.py: Bump version.
• Scripts/libraries/webkitscmpy/webkitscmpy/init.py: Ditto.
• Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:

(Svn._cache_revisions): Handle multiple double-branch commits.

• Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py:

(Svn._cache_revisions): Handle multiple double-branch commits.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/setup.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py (modified) (3 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-04-07  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Handle multiple double-branch commits
+        https://bugs.webkit.org/show_bug.cgi?id=224251
+        <rdar://problem/76288547>
+
+        Reviewed by Dewei Zhu.
+
+        There are a few cases, namely on the safari-607-branch, where some commits where made both
+        on trunk and on a branch. In one notable case, two sequential commits were made this way.
+
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
+        (Svn._cache_revisions): Handle multiple double-branch commits.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py:
+        (Svn._cache_revisions): Handle multiple double-branch commits.
+
 2021-04-07  Aakash Jain  <aakash_jain@apple.com>
 

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

@@ -30 +30 @@
 setup(
     name='webkitscmpy',
-    version='0.13.8',
+    version='0.13.9',
     description='Library designed to interact with git and svn repositories.',
     long_description=readme(),

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

@@ -47 +47 @@
     )
 
-version = Version(0, 13, 8)
+version = Version(0, 13, 9)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

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

@@ -166 +166 @@
                 raise self.Exception("Failed to construct branch history for '{}'".format(branch))
 
-            was_last_on_default = False
+            default_count = 0
             line = log.stdout.readline()
             while line:
@@ -182 +182 @@
                     if not is_default_branch:
                         if revision in self._metadata_cache[self.default_branch]:
-                            if was_last_on_default:
+                            # Only handle 2 sequential cross-branch commits
+                            if default_count > 2:
                                 break
-                            was_last_on_default = True
+                            default_count += 1
                         else:
-                            was_last_on_default = False
+                            default_count = 0
                     self._metadata_cache[branch].insert(pos, revision)
                 line = log.stdout.readline()
@@ -193 +194 @@
                 log.kill()
 
+        if default_count:
+            self._metadata_cache[branch] = self._metadata_cache[branch][default_count - 1:]
         if self._metadata_cache[self.default_branch][0] == [0]:
             self._metadata_cache['identifier'] = len(self._metadata_cache[branch])

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py

@@ -243 +243 @@
                 raise self.Exception("Failed to construct branch history for '{}'".format(branch))
 
-            was_last_on_default = False
+            default_count = 0
             for line in response.iter_lines():
                 match = self.HISTORY_RE.match(line)
@@ -260 +260 @@
                 if not is_default_branch:
                     if revision in self._metadata_cache[self.default_branch]:
-                        if was_last_on_default:
+                        # Only handle 2 sequential cross-branch commits
+                        if default_count > 2:
                             break
-                        was_last_on_default = True
+                        default_count += 1
                     else:
-                        was_last_on_default = False
+                        default_count = 0
                 self._metadata_cache[branch].insert(pos, revision)
 
+        if default_count:
+            self._metadata_cache[branch] = self._metadata_cache[branch][default_count - 1:]
         if self._metadata_cache[self.default_branch][0] == [0]:
             self._metadata_cache['identifier'] = len(self._metadata_cache[branch])