changeset 26689:2c9f15366982

exchange: record that we attempted to fetch a clone bundle This is needed so a subsequent patch can conditionally add a bundle2 part to the "getbundle" wire protocol command depending on whether a clone bundle was attempted.
author Gregory Szorc <gregory.szorc@gmail.com>
date Tue, 13 Oct 2015 14:55:02 -0700
parents 7394536338bb
children 704818fb170d
files mercurial/exchange.py
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Tue Oct 13 12:41:32 2015 -0700
+++ b/mercurial/exchange.py	Tue Oct 13 14:55:02 2015 -0700
@@ -958,6 +958,8 @@
         self.cgresult = None
         # list of step already done
         self.stepsdone = set()
+        # Whether we attempted a clone from pre-generated bundles.
+        self.clonebundleattempted = False
 
     @util.propertycache
     def pulledsubset(self):
@@ -1603,6 +1605,11 @@
         return
 
     res = remote._call('clonebundles')
+
+    # If we call the wire protocol command, that's good enough to record the
+    # attempt.
+    pullop.clonebundleattempted = True
+
     entries = parseclonebundlesmanifest(repo, res)
     if not entries:
         repo.ui.note(_('no clone bundles available on remote; '