Changeset 277220 in webkit

Timestamp:

May 7, 2021, 6:08:08 PM (5 years ago)

Author:

zhifei_fang@apple.com

Message:

Add support for syncing repo with commit revision label.
​https://bugs.webkit.org/show_bug.cgi?id=221982

Reviewed by Ryosuke Niwa.

Add new syncing option reportRevisionIdentifier, which will let the script try to sync the commit revision identifier from the commit message.
Add new syncing option reportSVNRevision, which will let the script try to report SVN revision from a git-svn repo.

• tools/sync-commits.py:

(main):
(load_repository):
(GitRepository.init):
(GitRepository.fetch_next_commit):
(GitRepository._git_hash_to_svn_revision):
(GitRepository._svn_revision_to_git_hash):
(GitRepository._revision_from_tokens):
(GitRepository._fetch_all_hashes):

Location:

trunk/Websites/perf.webkit.org

Files:

• ChangeLog (modified) (1 diff)
• tools/sync-commits.py (modified) (8 diffs)

trunk/Websites/perf.webkit.org/ChangeLog

@@ +1 @@
+2021-05-07  Zhifei Fang  <zhifei_fang@apple.com>
+        
+        Add support for syncing repo with commit revision label.
+        https://bugs.webkit.org/show_bug.cgi?id=221982
+
+        Reviewed by Ryosuke Niwa.
+
+        Add new syncing option reportRevisionIdentifier, which will let the script try to sync the commit revision identifier from the commit message.
+        Add new syncing option reportSVNRevision, which will let the script try to report SVN revision from a git-svn repo.
+
+        * tools/sync-commits.py:
+        (main):
+        (load_repository):
+        (GitRepository.__init__):
+        (GitRepository.fetch_next_commit):
+        (GitRepository._git_hash_to_svn_revision):
+        (GitRepository._svn_revision_to_git_hash):
+        (GitRepository._revision_from_tokens):
+        (GitRepository._fetch_all_hashes):
+
 2021-04-14  Zhifei Fang  <zhifei_fang@apple.com>
 

trunk/Websites/perf.webkit.org/tools/sync-commits.py

@@ -17 +17 @@
 from util import text_content
 
+# There are some buggy commit messages:
+# Canonical link: https://commits.webkit.org/https://commits.webkit.org/232477@main
+REVISION_IDENTIFIER_RE = re.compile(r'Canonical link: (https\://commits\.webkit\.org/)+(?P<revision_identifier>\d+@[\w\.\-]+)\n')
 
 def main(argv):
@@ -44 +47 @@
 def load_repository(repository):
     if 'gitCheckout' in repository:
-        return GitRepository(name=repository['name'], git_url=repository['url'], git_checkout=repository['gitCheckout'], git_branch=repository.get('branch'))
+        return GitRepository(
+            name=repository['name'], git_url=repository['url'], git_checkout=repository['gitCheckout'],
+            git_branch=repository.get('branch'), report_revision_identifier_in_commit_msg=repository.get('reportRevisionIdentifier'),
+            report_svn_revison=repository.get('reportSVNRevision'))
     return SVNRepository(name=repository['name'], svn_url=repository['url'], should_trust_certificate=repository.get('trustCertificate', False),
         use_server_auth=repository.get('useServerAuth', False), account_name_script_path=repository.get('accountNameFinderScript'))
@@ -193 +199 @@
 class GitRepository(Repository):
 
-    def __init__(self, name, git_checkout, git_url, git_branch=None):
+    def __init__(self, name, git_checkout, git_url, git_branch=None, report_revision_identifier_in_commit_msg=False, report_svn_revison=False):
         assert(os.path.isdir(git_checkout))
         super(GitRepository, self).__init__(name)
@@ -200 +206 @@
         self._git_branch = git_branch
         self._tokenized_hashes = []
+        self._report_revision_identifier_in_commit_msg = report_revision_identifier_in_commit_msg
+        self._report_svn_revision = report_svn_revison
 
     def fetch_next_commit(self, server_config, last_fetched):
@@ -206 +214 @@
             tokens = self._tokenized_hashes[0]
         else:
+            if self._report_svn_revision:
+                last_fetched_git_hash = self._git_hash_from_svn_revision(last_fetched)
+                if not last_fetched_git_hash:
+                    self._fetch_remote()
+                    last_fetched_git_hash = self._git_hash_from_svn_revision(last_fetched)
+                    if not last_fetched_git_hash:
+                        raise ValueError('Cannot find the git hash for the last fetched svn revision')
+                last_fetched = last_fetched_git_hash
             tokens = self._find_next_hash(last_fetched)
             if not tokens:
@@ -221 +237 @@
         return None
 
+    def _svn_revision_from_git_hash(self, git_hash):
+        return self._run_git_command(['svn', 'find-rev', git_hash]).strip()
+
+    def _git_hash_from_svn_revision(self, revision):
+        return self._run_git_command(['svn', 'find-rev', 'r{}'.format(revision)]).strip()
+
     def _revision_from_tokens(self, tokens):
         current_hash = tokens[0]
@@ -230 +252 @@
         message = self._run_git_command(['log', current_hash, '-1', '--pretty=%B'])
 
+        revision_identifier = None
+        if self._report_revision_identifier_in_commit_msg:
+            revision_identifier_match = REVISION_IDENTIFIER_RE.search(message)
+            if not revision_identifier_match:
+                raise ValueError('Expected commit message to include revision identifier, but cannot find it, will need a history rewrite to fix it')
+            revision_identifier = revision_identifier_match.group('revision_identifier')
+
+        current_revision = current_hash
+        previous_revision = previous_hash
+        if self._report_svn_revision:
+            current_revision = self._svn_revision_from_git_hash(current_hash)
+            if not current_revision:
+                raise ValueError('Cannot find SVN revison for {}'.format(current_hash))
+            if previous_hash:
+                previous_revision = self._svn_revision_from_git_hash(previous_hash)
+                if not previous_revision:
+                    raise ValueError('Cannot find SVN revison for {}'.format(previous_hash))
+
         return {
             'repository': self._name,
-            'revision': current_hash,
-            'previousCommit': previous_hash,
+            'revision': current_revision,
+            'revisionIdentifier': revision_identifier,
+            'previousCommit': previous_revision,
             'time': datetime.fromtimestamp(commit_time).strftime(r'%Y-%m-%dT%H:%M:%S.%f'),
             'author': {'account': author_email, 'name': author_name},
@@ -245 +286 @@
         return None
 
+    def _fetch_remote(self):
+        self._run_git_command(['pull', self._git_url])
+        if self._report_svn_revision:
+            self._run_git_command(['svn', 'fetch'])
+
     def _fetch_all_hashes(self):
-        self._run_git_command(['pull', self._git_url])
+        self._fetch_remote()
         scope = self._git_branch or '--all'
         lines = self._run_git_command(['log', scope, '--date-order', '--reverse', '--pretty=%H %ct %ce %P']).split('\n')