Changeset 271455 in webkit

Timestamp:

Jan 13, 2021, 2:33:10 PM (6 years ago)

Author:

Jonathan Bedard

Message:

[webkitscmpy] Handle single commit touching multiple branches
​https://bugs.webkit.org/show_bug.cgi?id=220601
<rdar://problem/73165609>

Reviewed by Stephanie Lewis.

In WebKit's history, there are a few cases of commits that touch multiple branches (like
​https://trac.webkit.org/changeset/92419/webkit). These types of commits are not correct,
but we need to handle them if they are in the history of a branch.

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

(Svn._cache_revisions): Branches only intersect trunk when two sequential commits are from trunk.
(Svn.commit): Support case where no commit time can be found.

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

(Svn._cache_revisions): Branches only intersect trunk when two sequential commits are from trunk.
(Svn.commit): Support case where no commit time can be found.

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) (4 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-13  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Handle single commit touching multiple branches
+        https://bugs.webkit.org/show_bug.cgi?id=220601
+        <rdar://problem/73165609>
+
+        Reviewed by Stephanie Lewis.
+
+        In WebKit's history, there are a few cases of commits that touch multiple branches (like
+        https://trac.webkit.org/changeset/92419/webkit). These types of commits are not correct,
+        but we need to handle them if they are in the history of a branch.
+
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
+        (Svn._cache_revisions): Branches only intersect trunk when two sequential commits are from trunk.
+        (Svn.commit): Support case where no commit time can be found.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py:
+        (Svn._cache_revisions): Branches only intersect trunk when two sequential commits are from trunk.
+        (Svn.commit): Support case where no commit time can be found.
+
 2021-01-13  Aakash Jain  <aakash_jain@apple.com>
 

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

@@ -31 +31 @@
 setup(
     name='webkitscmpy',
-    version='0.8.0',
+    version='0.8.1',
     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, 8, 0)
+version = Version(0, 8, 1)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

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

@@ -165 +165 @@
                 raise self.Exception("Failed to construct branch history for '{}'".format(branch))
 
+            was_last_on_default = False
             line = log.stdout.readline()
             while line:
@@ -180 +181 @@
                     if not is_default_branch:
                         if revision in self._metadata_cache[self.default_branch]:
-                            self._metadata_cache[branch].insert(pos, revision)
-                            break
+                            if was_last_on_default:
+                                break
+                            was_last_on_default = True
+                        else:
+                            was_last_on_default = False
                     self._metadata_cache[branch].insert(pos, revision)
                 line = log.stdout.readline()
@@ -327 +331 @@
                 branch = self._branch_for(revision)
 
-        date = info['Last Changed Date'].split(' (')[0]
-        tz_diff = date.split(' ')[-1]
-        date = datetime.strptime(date[:-len(tz_diff)], '%Y-%m-%d %H:%M:%S ')
-        date += timedelta(
-            hours=int(tz_diff[1:3]),
-            minutes=int(tz_diff[3:5]),
-        ) * (1 if tz_diff[0] == '-' else -1)
+        date = info['Last Changed Date'].split(' (')[0] if info.get('Last Changed Date') else None
+        if date:
+            tz_diff = date.split(' ')[-1]
+            date = datetime.strptime(date[:-len(tz_diff)], '%Y-%m-%d %H:%M:%S ')
+            date += timedelta(
+                hours=int(tz_diff[1:3]),
+                minutes=int(tz_diff[3:5]),
+            ) * (1 if tz_diff[0] == '-' else -1)
 
         if not identifier:
@@ -377 +382 @@
             identifier=identifier,
             branch_point=branch_point,
-            timestamp=int(calendar.timegm(date.timetuple())),
+            timestamp=int(calendar.timegm(date.timetuple())) if date else None,
             author=author,
             message=message,

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

@@ -233 +233 @@
                 raise self.Exception("Failed to construct branch history for '{}'".format(branch))
 
+            was_last_on_default = False
             for line in response.iter_lines():
                 match = self.HISTORY_RE.match(line)
@@ -249 +250 @@
                 if not is_default_branch:
                     if revision in self._metadata_cache[self.default_branch]:
-                        self._metadata_cache[branch].insert(pos, revision)
-                        break
+                        if was_last_on_default:
+                            break
+                        was_last_on_default = True
+                    else:
+                        was_last_on_default = False
                 self._metadata_cache[branch].insert(pos, revision)
 
@@ -387 +391 @@
                 branch = self._branch_for(revision)
 
-        date = datetime.strptime(info['Last Changed Date'], '%Y-%m-%d %H:%M:%S')
+        date = datetime.strptime(info['Last Changed Date'], '%Y-%m-%d %H:%M:%S') if info.get('Last Changed Date') else None
 
         if not identifier:
@@ -434 +438 @@
             identifier=identifier,
             branch_point=branch_point,
-            timestamp=int(calendar.timegm(date.timetuple())),
+            timestamp=int(calendar.timegm(date.timetuple())) if date else None,
             author=author,
             message=message,