Patchwork D9209: clonebundle: move the manifest filename to a constant

login
register
mail settings
Submitter phabricator
Date Oct. 14, 2020, 11:34 p.m.
Message ID <differential-rev-PHID-DREV-dssk4kdisw6ujfbu2iir-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47470/
State Superseded
Headers show

Comments

phabricator - Oct. 14, 2020, 11:34 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I am about to add more reference to it, so I would rather have it an explicit
  constant. This allow to unify various call too.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9209

AFFECTED FILES
  hgext/clonebundles.py
  mercurial/bundlecaches.py
  mercurial/localrepo.py
  mercurial/wireprotov1server.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/wireprotov1server.py b/mercurial/wireprotov1server.py
--- a/mercurial/wireprotov1server.py
+++ b/mercurial/wireprotov1server.py
@@ -273,7 +273,7 @@ 
     data center given the client's IP address.
     """
     return wireprototypes.bytesresponse(
-        repo.vfs.tryread(b'clonebundles.manifest')
+        repo.vfs.tryread(bundlecaches.CB_MANIFEST_FILE)
     )
 
 
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -31,6 +31,7 @@ 
     bookmarks,
     branchmap,
     bundle2,
+    bundlecaches,
     changegroup,
     color,
     commit,
@@ -299,7 +300,7 @@ 
         return self._caps
 
     def clonebundles(self):
-        return self._repo.tryread(b'clonebundles.manifest')
+        return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE)
 
     def debugwireargs(self, one, two, three=None, four=None, five=None):
         """Used to test argument passing over the wire"""
diff --git a/mercurial/bundlecaches.py b/mercurial/bundlecaches.py
--- a/mercurial/bundlecaches.py
+++ b/mercurial/bundlecaches.py
@@ -16,6 +16,8 @@ 
 
 urlreq = util.urlreq
 
+CB_MANIFEST_FILE = b'clonebundles.manifest'
+
 
 @attr.s
 class bundlespec(object):
diff --git a/hgext/clonebundles.py b/hgext/clonebundles.py
--- a/hgext/clonebundles.py
+++ b/hgext/clonebundles.py
@@ -205,6 +205,7 @@ 
 from __future__ import absolute_import
 
 from mercurial import (
+    bundlecaches,
     extensions,
     wireprotov1server,
 )
@@ -218,7 +219,7 @@ 
     # Only advertise if a manifest exists. This does add some I/O to requests.
     # But this should be cheaper than a wasted network round trip due to
     # missing file.
-    if repo.vfs.exists(b'clonebundles.manifest'):
+    if repo.vfs.exists(bundlecaches.CB_MANIFEST_FILE):
         caps.append(b'clonebundles')
 
     return caps