Merge "init: Add --no-clone-bundle option"
diff --git a/repo b/repo
index ebd12c6..5e619ae 100755
--- a/repo
+++ b/repo
@@ -196,6 +196,9 @@
help='restrict manifest projects to ones with a specified '
'platform group [auto|all|none|linux|darwin|...]',
metavar='PLATFORM')
+group.add_option('--no-clone-bundle',
+ dest='no_clone_bundle', action='store_true',
+ help='disable use of /clone.bundle on HTTP/HTTPS')
# Tool
@@ -339,7 +342,7 @@
can_verify = True
dst = os.path.abspath(os.path.join(repodir, S_repo))
- _Clone(url, dst, opt.quiet)
+ _Clone(url, dst, opt.quiet, not opt.no_clone_bundle)
if can_verify and not opt.no_repo_verify:
rev = _Verify(dst, branch, opt.quiet)
@@ -577,7 +580,7 @@
os.remove(path)
-def _Clone(url, local, quiet):
+def _Clone(url, local, quiet, clone_bundle):
"""Clones a git repository to a new subdirectory of repodir
"""
try:
@@ -607,7 +610,7 @@
_SetConfig(local,
'remote.origin.fetch',
'+refs/heads/*:refs/remotes/origin/*')
- if _DownloadBundle(url, local, quiet):
+ if clone_bundle and _DownloadBundle(url, local, quiet):
_ImportBundle(local)
_Fetch(url, local, 'origin', quiet)
diff --git a/subcmds/init.py b/subcmds/init.py
index 77153ed..45d69b7 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -61,6 +61,11 @@
directory when fetching from the server. This will make the sync
go a lot faster by reducing data traffic on the network.
+The --no-clone-bundle option disables any attempt to use
+$URL/clone.bundle to bootstrap a new Git repository from a
+resumeable bundle file on a content delivery network. This
+may be necessary if there are problems with the local Python
+HTTP client or proxy configuration, but the Git binary works.
Switching Manifest Branches
---------------------------
@@ -113,6 +118,9 @@
help='restrict manifest projects to ones with a specified '
'platform group [auto|all|none|linux|darwin|...]',
metavar='PLATFORM')
+ g.add_option('--no-clone-bundle',
+ dest='no_clone_bundle', action='store_true',
+ help='disable use of /clone.bundle on HTTP/HTTPS')
# Tool
g = p.add_option_group('repo Version options')
@@ -222,7 +230,8 @@
'in another location.', file=sys.stderr)
sys.exit(1)
- if not m.Sync_NetworkHalf(is_new=is_new, quiet=opt.quiet):
+ if not m.Sync_NetworkHalf(is_new=is_new, quiet=opt.quiet,
+ clone_bundle=not opt.no_clone_bundle):
r = m.GetRemote(m.remote.name)
print('fatal: cannot obtain manifest %s' % r.url, file=sys.stderr)
