equal
deleted
inserted
replaced
1675 """Apply a clone bundle from a remote, if possible.""" |
1675 """Apply a clone bundle from a remote, if possible.""" |
1676 |
1676 |
1677 repo = pullop.repo |
1677 repo = pullop.repo |
1678 remote = pullop.remote |
1678 remote = pullop.remote |
1679 |
1679 |
1680 if not repo.ui.configbool('experimental', 'clonebundles', False): |
1680 if not repo.ui.configbool('ui', 'clonebundles', True): |
1681 return |
1681 return |
1682 |
1682 |
1683 # Only run if local repo is empty. |
1683 # Only run if local repo is empty. |
1684 if len(repo): |
1684 if len(repo): |
1685 return |
1685 return |
1731 else: |
1731 else: |
1732 raise error.Abort(_('error applying bundle'), |
1732 raise error.Abort(_('error applying bundle'), |
1733 hint=_('if this error persists, consider contacting ' |
1733 hint=_('if this error persists, consider contacting ' |
1734 'the server operator or disable clone ' |
1734 'the server operator or disable clone ' |
1735 'bundles via ' |
1735 'bundles via ' |
1736 '"--config experimental.clonebundles=false"')) |
1736 '"--config ui.clonebundles=false"')) |
1737 |
1737 |
1738 def parseclonebundlesmanifest(repo, s): |
1738 def parseclonebundlesmanifest(repo, s): |
1739 """Parses the raw text of a clone bundles manifest. |
1739 """Parses the raw text of a clone bundles manifest. |
1740 |
1740 |
1741 Returns a list of dicts. The dicts have a ``URL`` key corresponding |
1741 Returns a list of dicts. The dicts have a ``URL`` key corresponding |