diff options
Diffstat (limited to 'subcmds/sync.py')
-rw-r--r-- | subcmds/sync.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index 9e4c7750..1ea102c0 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -327,14 +327,14 @@ later is required to fix a server side protocol bug. | |||
327 | try: | 327 | try: |
328 | try: | 328 | try: |
329 | success = project.Sync_NetworkHalf( | 329 | success = project.Sync_NetworkHalf( |
330 | quiet=opt.quiet, | 330 | quiet=opt.quiet, |
331 | current_branch_only=opt.current_branch_only, | 331 | current_branch_only=opt.current_branch_only, |
332 | force_sync=opt.force_sync, | 332 | force_sync=opt.force_sync, |
333 | clone_bundle=not opt.no_clone_bundle, | 333 | clone_bundle=not opt.no_clone_bundle, |
334 | no_tags=opt.no_tags, archive=self.manifest.IsArchive, | 334 | no_tags=opt.no_tags, archive=self.manifest.IsArchive, |
335 | optimized_fetch=opt.optimized_fetch, | 335 | optimized_fetch=opt.optimized_fetch, |
336 | prune=opt.prune, | 336 | prune=opt.prune, |
337 | clone_filter=clone_filter) | 337 | clone_filter=clone_filter) |
338 | self._fetch_times.Set(project, time.time() - start) | 338 | self._fetch_times.Set(project, time.time() - start) |
339 | 339 | ||
340 | # Lock around all the rest of the code, since printing, updating a set | 340 | # Lock around all the rest of the code, since printing, updating a set |
@@ -356,7 +356,7 @@ later is required to fix a server side protocol bug. | |||
356 | pass | 356 | pass |
357 | except Exception as e: | 357 | except Exception as e: |
358 | print('error: Cannot fetch %s (%s: %s)' | 358 | print('error: Cannot fetch %s (%s: %s)' |
359 | % (project.name, type(e).__name__, str(e)), file=sys.stderr) | 359 | % (project.name, type(e).__name__, str(e)), file=sys.stderr) |
360 | err_event.set() | 360 | err_event.set() |
361 | raise | 361 | raise |
362 | finally: | 362 | finally: |
@@ -704,16 +704,16 @@ later is required to fix a server side protocol bug. | |||
704 | gitdir = os.path.join(self.manifest.topdir, path, '.git') | 704 | gitdir = os.path.join(self.manifest.topdir, path, '.git') |
705 | if os.path.exists(gitdir): | 705 | if os.path.exists(gitdir): |
706 | project = Project( | 706 | project = Project( |
707 | manifest=self.manifest, | 707 | manifest=self.manifest, |
708 | name=path, | 708 | name=path, |
709 | remote=RemoteSpec('origin'), | 709 | remote=RemoteSpec('origin'), |
710 | gitdir=gitdir, | 710 | gitdir=gitdir, |
711 | objdir=gitdir, | 711 | objdir=gitdir, |
712 | worktree=os.path.join(self.manifest.topdir, path), | 712 | worktree=os.path.join(self.manifest.topdir, path), |
713 | relpath=path, | 713 | relpath=path, |
714 | revisionExpr='HEAD', | 714 | revisionExpr='HEAD', |
715 | revisionId=None, | 715 | revisionId=None, |
716 | groups=None) | 716 | groups=None) |
717 | 717 | ||
718 | if project.IsDirty() and opt.force_remove_dirty: | 718 | if project.IsDirty() and opt.force_remove_dirty: |
719 | print('WARNING: Removing dirty project "%s": uncommitted changes ' | 719 | print('WARNING: Removing dirty project "%s": uncommitted changes ' |
@@ -885,7 +885,7 @@ later is required to fix a server side protocol bug. | |||
885 | 885 | ||
886 | manifest_name = opt.manifest_name | 886 | manifest_name = opt.manifest_name |
887 | smart_sync_manifest_path = os.path.join( | 887 | smart_sync_manifest_path = os.path.join( |
888 | self.manifest.manifestProject.worktree, 'smart_sync_override.xml') | 888 | self.manifest.manifestProject.worktree, 'smart_sync_override.xml') |
889 | 889 | ||
890 | if opt.smart_sync or opt.smart_tag: | 890 | if opt.smart_sync or opt.smart_tag: |
891 | manifest_name = self._SmartSyncSetup(opt, smart_sync_manifest_path) | 891 | manifest_name = self._SmartSyncSetup(opt, smart_sync_manifest_path) |