diff options
Diffstat (limited to 'subcmds')
-rw-r--r-- | subcmds/init.py | 11 | ||||
-rw-r--r-- | subcmds/sync.py | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/subcmds/init.py b/subcmds/init.py index ce8b0187..eb82e2e4 100644 --- a/subcmds/init.py +++ b/subcmds/init.py | |||
@@ -155,9 +155,11 @@ to update the working directory files. | |||
155 | help='restrict manifest projects to ones with a specified ' | 155 | help='restrict manifest projects to ones with a specified ' |
156 | 'platform group [auto|all|none|linux|darwin|...]', | 156 | 'platform group [auto|all|none|linux|darwin|...]', |
157 | metavar='PLATFORM') | 157 | metavar='PLATFORM') |
158 | g.add_option('--clone-bundle', action='store_true', | ||
159 | help='force use of /clone.bundle on HTTP/HTTPS (default if not --partial-clone)') | ||
158 | g.add_option('--no-clone-bundle', | 160 | g.add_option('--no-clone-bundle', |
159 | dest='clone_bundle', default=True, action='store_false', | 161 | dest='clone_bundle', action='store_false', |
160 | help='disable use of /clone.bundle on HTTP/HTTPS') | 162 | help='disable use of /clone.bundle on HTTP/HTTPS (default if --partial-clone)') |
161 | g.add_option('--no-tags', | 163 | g.add_option('--no-tags', |
162 | dest='tags', default=True, action='store_false', | 164 | dest='tags', default=True, action='store_false', |
163 | help="don't fetch tags in the manifest") | 165 | help="don't fetch tags in the manifest") |
@@ -303,6 +305,11 @@ to update the working directory files. | |||
303 | else: | 305 | else: |
304 | opt.clone_filter = None | 306 | opt.clone_filter = None |
305 | 307 | ||
308 | if opt.clone_bundle is None: | ||
309 | opt.clone_bundle = False if opt.partial_clone else True | ||
310 | else: | ||
311 | m.config.SetString('repo.clonebundle', 'true' if opt.clone_bundle else 'false') | ||
312 | |||
306 | if opt.submodules: | 313 | if opt.submodules: |
307 | m.config.SetString('repo.submodules', 'true') | 314 | m.config.SetString('repo.submodules', 'true') |
308 | 315 | ||
diff --git a/subcmds/sync.py b/subcmds/sync.py index efd39616..a40dd5e0 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -247,8 +247,9 @@ later is required to fix a server side protocol bug. | |||
247 | p.add_option('-m', '--manifest-name', | 247 | p.add_option('-m', '--manifest-name', |
248 | dest='manifest_name', | 248 | dest='manifest_name', |
249 | help='temporary manifest to use for this sync', metavar='NAME.xml') | 249 | help='temporary manifest to use for this sync', metavar='NAME.xml') |
250 | p.add_option('--no-clone-bundle', | 250 | p.add_option('--clone-bundle', action='store_true', |
251 | dest='clone_bundle', default=True, action='store_false', | 251 | help='enable use of /clone.bundle on HTTP/HTTPS') |
252 | p.add_option('--no-clone-bundle', dest='clone_bundle', action='store_false', | ||
252 | help='disable use of /clone.bundle on HTTP/HTTPS') | 253 | help='disable use of /clone.bundle on HTTP/HTTPS') |
253 | p.add_option('-u', '--manifest-server-username', action='store', | 254 | p.add_option('-u', '--manifest-server-username', action='store', |
254 | dest='manifest_server_username', | 255 | dest='manifest_server_username', |
@@ -836,6 +837,9 @@ later is required to fix a server side protocol bug. | |||
836 | smart_sync_manifest_path = os.path.join( | 837 | smart_sync_manifest_path = os.path.join( |
837 | self.manifest.manifestProject.worktree, 'smart_sync_override.xml') | 838 | self.manifest.manifestProject.worktree, 'smart_sync_override.xml') |
838 | 839 | ||
840 | if opt.clone_bundle is None: | ||
841 | opt.clone_bundle = self.manifest.CloneBundle | ||
842 | |||
839 | if opt.smart_sync or opt.smart_tag: | 843 | if opt.smart_sync or opt.smart_tag: |
840 | manifest_name = self._SmartSyncSetup(opt, smart_sync_manifest_path) | 844 | manifest_name = self._SmartSyncSetup(opt, smart_sync_manifest_path) |
841 | else: | 845 | else: |