# HG changeset patch # User Pierre-Yves David # Date 1685112952 -7200 # Node ID e6948aafda6f730a668ad1eb0ed6a8173da0f6db # Parent 9db197c731383d36fdfdb2f041d67710566d3a87 clonebundles: move the manifest reading in a dedicated function We are about to make the logic more advanced to help hosting solution, so we need to centralize it first. diff -r 9db197c73138 -r e6948aafda6f mercurial/bundlecaches.py --- a/mercurial/bundlecaches.py Mon May 29 17:04:14 2023 +0100 +++ b/mercurial/bundlecaches.py Fri May 26 16:55:52 2023 +0200 @@ -25,6 +25,9 @@ CB_MANIFEST_FILE = b'clonebundles.manifest' +def get_manifest(repo): + return repo.vfs.tryread(CB_MANIFEST_FILE) + @attr.s class bundlespec: diff -r 9db197c73138 -r e6948aafda6f mercurial/localrepo.py --- a/mercurial/localrepo.py Mon May 29 17:04:14 2023 +0100 +++ b/mercurial/localrepo.py Fri May 26 16:55:52 2023 +0200 @@ -349,7 +349,7 @@ return self._caps def clonebundles(self): - return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE) + return bundlecaches.get_manifest(self._repo) def debugwireargs(self, one, two, three=None, four=None, five=None): """Used to test argument passing over the wire""" diff -r 9db197c73138 -r e6948aafda6f mercurial/wireprotov1server.py --- a/mercurial/wireprotov1server.py Mon May 29 17:04:14 2023 +0100 +++ b/mercurial/wireprotov1server.py Fri May 26 16:55:52 2023 +0200 @@ -274,9 +274,8 @@ depending on the request. e.g. you could advertise URLs for the closest data center given the client's IP address. """ - return wireprototypes.bytesresponse( - repo.vfs.tryread(bundlecaches.CB_MANIFEST_FILE) - ) + manifest = bundlecaches.get_manifest(repo) + return wireprototypes.bytesresponse(manifest) wireprotocaps = [