Mercurial > hg-stable
changeset 26855:9350f00a7b23 stable
exchange: do not attempt clone bundle if local repo is non-empty (issue4932)
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Tue, 03 Nov 2015 12:16:54 -0800 |
| parents | cb4b0ec54990 |
| children | baa77652be68 |
| files | mercurial/exchange.py tests/test-clonebundles.t |
| diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/exchange.py Tue Nov 03 12:15:14 2015 -0800 +++ b/mercurial/exchange.py Tue Nov 03 12:16:54 2015 -0800 @@ -1658,6 +1658,10 @@ if not repo.ui.configbool('experimental', 'clonebundles', False): return + # Only run if local repo is empty. + if len(repo): + return + if pullop.heads: return
--- a/tests/test-clonebundles.t Tue Nov 03 12:15:14 2015 -0800 +++ b/tests/test-clonebundles.t Tue Nov 03 12:16:54 2015 -0800 @@ -167,12 +167,6 @@ $ cd partial-clone $ hg pull pulling from http://localhost:$HGPORT/ - applying clone bundle from http://localhost:$HGPORT1/partial.hg - adding changesets - adding manifests - adding file changes - added 0 changesets with 0 changes to 1 files - finished applying clone bundle searching for changes adding changesets adding manifests