Context Navigation

Changeset 286623 in webkit

Timestamp:

Dec 7, 2021, 2:31:12 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[commits.webkit.org] Fallback to remote repository (Part 1)
https://bugs.webkit.org/show_bug.cgi?id=233904
<rdar://problem/86131927>

Reviewed by Dewei Zhu.

(Checkout.Encoder.default):
(Checkout.init): Allow user to specify a remote fallback repository.

(CheckoutRoute.commit): If no commit is found, query the fallback repository.

Location:

trunk/Tools

Files:

-              r286605
+              r286623
+-12-06  Jonathan Bedard  <jbedard@apple.com>
+        [commits.webkit.org] Fallback to remote repository (Part 1)
+        https://bugs.webkit.org/show_bug.cgi?id=233904
+        <rdar://problem/86131927>
+        Reviewed by Dewei Zhu.
+        * Scripts/libraries/reporelaypy/reporelaypy/__init__.py: Bump version.
+        * Scripts/libraries/reporelaypy/reporelaypy/checkout.py:
+        (Checkout.Encoder.default):
+        (Checkout.__init__): Allow user to specify a remote fallback repository.
+        * Scripts/libraries/reporelaypy/reporelaypy/checkoutroute.py:
+        (CheckoutRoute.commit): If no commit is found, query the fallback repository.
+        * Scripts/libraries/reporelaypy/run: Add --fallback option.
+        * Scripts/libraries/reporelaypy/setup.py: Bump version.
 -12-07  Lauro Moura  <lmoura@igalia.com>

-              r286576
+              r286623
 from webkitcorepy import run
 from webkitscmpy import local
+from webkitscmpy import local, remote
 …
                 return super(Checkout.Encoder, self).default(obj)
             return dict(
+            result = dict(
                 path=obj.path,
                 url=obj.url,
                 sentinal=obj.sentinal,
+            )
+            if obj.fallback_repository:
+                result['fallback_url'] = obj.fallback_repository.url
+            return result
     @classmethod
 …
         return 0
     def __init__(self, path, url=None, http_proxy=None, sentinal=True, primary=True):
+    def __init__(self, path, url=None, http_proxy=None, sentinal=True, fallback_url=None, primary=True):
         self.sentinal = sentinal
         self.path = path
 …
         self._repository = None
         self._child_process = None
+        self.fallback_repository = remote.Scm.from_url(fallback_url) if fallback_url else None
+        if self.fallback_repository:
+            self.fallback_repository.commit()
         containing_path = os.path.dirname(path)

-              r286576
+              r286623
             return None
+        commit = self.checkout.repository.find(ref) if ref else self.checkout.repository.commit()
+        commit = None
+        try:
+            commit = self.checkout.repository.find(ref) if ref else self.checkout.repository.commit()
+        except (RuntimeError, ValueError):
+            pass
         if not commit:
+            return commit
+            try:
+                if self.checkout.fallback_repository:
+                    return self.checkout.fallback_repository.find(ref)
+            except (RuntimeError, ValueError):
+                pass
+            return None
         encoded = json.dumps(commit, cls=Commit.Encoder)

-              r286576
+              r286623
         help='Set the number of seconds to wait between polling git checkout',
+    )
+    group.add_argument(
+        '--fallback', dest='fallback', default=None, action='store', type=str,
+        help='Fallback repository URL',
+    )
     group = parser.add_argument_group('Database')
 …
     print('Finding checkout...')
+    checkout = Checkout(path=args.path, url=args.url, http_proxy=args.http_proxy, sentinal=args.sentinal)
+    checkout = Checkout(
+        path=args.path,
+        url=args.url,
+        http_proxy=args.http_proxy,
+        sentinal=args.sentinal,
+        fallback_url=args.fallback,
+    )
     print('Git checkout:')
     print('    Path: {}'.format(checkout.path))
     print('    URL: {}'.format(checkout.url))
+    if checkout.fallback_repository:
+        print('    Fallback: {}'.format(checkout.fallback_repository.url))
     if not checkout.repository:
         print('    Cloning repository...')

r286605	r286623
31	31	setup(
32	32	name='reporelaypy',
33		version='0.~~1.2~~',
	33	version='0.2.0',
34	34	description='Library for visualizing, processing and storing test results.',
35	35	long_description=readme(),

Note: See TracChangeset for help on using the changeset viewer.