configwizard: remove code for bundleclone and clonebundles (bug 1277406); r?glob draft
authorGregory Szorc <gps@mozilla.com>
Wed, 01 Jun 2016 15:44:40 -0700
changeset 8498 12be4bfbca37081642f4ef0768f524fca7aa7c55
parent 8497 57cf6aa564b83f61765505a3d18ec03dedb7cd0a
child 8499 8b806607312d968c33108bd4de84949f2275a330
push id918
push userbmo:gps@mozilla.com
push dateThu, 09 Jun 2016 19:23:31 +0000
reviewersglob
bugs1277406
configwizard: remove code for bundleclone and clonebundles (bug 1277406); r?glob clonebundles is built into Mercurial as of 3.6 and enabled by default in 3.7. Let's not bother ourselves with this code any more: over time people will have clonebundles enabled in the vanilla install. MozReview-Commit-ID: CClaXGaTS60
hgext/configwizard/hgsetup/config.py
hgext/configwizard/hgsetup/wizard.py
--- a/hgext/configwizard/hgsetup/config.py
+++ b/hgext/configwizard/hgsetup/config.py
@@ -69,31 +69,16 @@ class MercurialConfig(object):
         if 'bugzilla' not in self._c:
             return
 
         b = self._c['bugzilla']
         for k in ('password', 'userid', 'cookie'):
             if k in b:
                 del b[k]
 
-    def have_clonebundles(self):
-        return 'clonebundles' in self._c.get('experimental', {})
-
-    def activate_clonebundles(self):
-        exp = self._c.setdefault('experimental', {})
-        exp['clonebundles'] = 'true'
-
-        # bundleclone is redundant with clonebundles. Remove it if it
-        # is installed.
-        ext = self._c.get('extensions', {})
-        try:
-            del ext['bundleclone']
-        except KeyError:
-            pass
-
     def have_wip(self):
         return 'wip' in self._c.get('alias', {})
 
     def install_wip_alias(self):
         """hg wip shows a concise view of work in progress."""
         alias = self._c.setdefault('alias', {})
         alias['wip'] = 'log --graph --rev=wip --template=wip'
 
--- a/hgext/configwizard/hgsetup/wizard.py
+++ b/hgext/configwizard/hgsetup/wizard.py
@@ -131,37 +131,16 @@ try syntax and pushes it to the try serv
 to be used in concert with other tools generating try syntax so that
 they can push to try without depending on mq or other workarounds.
 
 (Relevant config option: extensions.push-to-try)
 
 Would you like to activate push-to-try
 '''.strip()
 
-CLONEBUNDLES_INFO = '''
-Mercurial 3.6 and hg.mozilla.org support transparently cloning from a CDN,
-making clones faster and more reliable.
-
-(Relevant config option: experimental.clonebundles)
-
-Would you like to activate this feature and have faster clones
-'''.strip()
-
-BUNDLECLONE_MINIMUM_VERSION = LooseVersion('3.1')
-
-BUNDLECLONE_INFO = '''
-The bundleclone extension makes cloning faster and saves server resources.
-
-We highly recommend you activate this extension.
-
-(Relevant config option: extensions.bundleclone)
-
-Would you like to activate bundleclone
-'''.strip()
-
 WIP_INFO = '''
 It is common to want a quick view of changesets that are in progress.
 
 The ``hg wip`` command provides should a view.
 
 Example Usage:
 
   $ hg wip
@@ -281,25 +260,16 @@ class MercurialSetupWizard(object):
         self.prompt_external_extension(c, 'bzexport', BZEXPORT_INFO)
 
         if hg_version >= BZPOST_MINIMUM_VERSION:
             self.prompt_external_extension(c, 'bzpost', BZPOST_INFO)
 
         if hg_version >= FIREFOXTREE_MINIMUM_VERSION:
             self.prompt_external_extension(c, 'firefoxtree', FIREFOXTREE_INFO)
 
-        # Functionality from bundleclone is experimental in Mercurial 3.6.
-        # There was a bug in 3.6, so look for 3.6.1.
-        if hg_version >= LooseVersion('3.6.1'):
-            if not c.have_clonebundles() and self._prompt_yn(CLONEBUNDLES_INFO):
-                c.activate_clonebundles()
-                print('Enabled the clonebundles feature.\n')
-        elif hg_version >= BUNDLECLONE_MINIMUM_VERSION:
-            self.prompt_external_extension(c, 'bundleclone', BUNDLECLONE_INFO)
-
         if hg_version >= PUSHTOTRY_MINIMUM_VERSION:
             self.prompt_external_extension(c, 'push-to-try', PUSHTOTRY_INFO)
 
         if not c.have_wip():
             if self._prompt_yn(WIP_INFO):
                 c.install_wip_alias()
 
         if 'reviewboard' in c.extensions or 'bzpost' in c.extensions: