diff options
Diffstat (limited to 'subcmds/sync.py')
| -rw-r--r-- | subcmds/sync.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index bdb5616c..87d3cd8c 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -1112,10 +1112,9 @@ later is required to fix a server side protocol bug. | |||
| 1112 | ) | 1112 | ) |
| 1113 | if expected: | 1113 | if expected: |
| 1114 | if not opt.quiet: | 1114 | if not opt.quiet: |
| 1115 | logger.info( | 1115 | print( |
| 1116 | "%s: Shared project %s found, disabling pruning.", | 1116 | "\r%s: Shared project %s found, disabling pruning." |
| 1117 | relpath, | 1117 | % (relpath, project.name) |
| 1118 | project.name, | ||
| 1119 | ) | 1118 | ) |
| 1120 | 1119 | ||
| 1121 | if git_require((2, 7, 0)): | 1120 | if git_require((2, 7, 0)): |
| @@ -1132,7 +1131,7 @@ later is required to fix a server side protocol bug. | |||
| 1132 | project.config.SetString("gc.pruneExpire", "never") | 1131 | project.config.SetString("gc.pruneExpire", "never") |
| 1133 | else: | 1132 | else: |
| 1134 | if not opt.quiet: | 1133 | if not opt.quiet: |
| 1135 | logger.info("%s: not shared, disabling pruning.", relpath) | 1134 | print(f"\r{relpath}: not shared, disabling pruning.") |
| 1136 | project.config.SetString("extensions.preciousObjects", None) | 1135 | project.config.SetString("extensions.preciousObjects", None) |
| 1137 | project.config.SetString("gc.pruneExpire", None) | 1136 | project.config.SetString("gc.pruneExpire", None) |
| 1138 | 1137 | ||
| @@ -1366,7 +1365,7 @@ later is required to fix a server side protocol bug. | |||
| 1366 | 1365 | ||
| 1367 | manifest_server = manifest.manifest_server | 1366 | manifest_server = manifest.manifest_server |
| 1368 | if not opt.quiet: | 1367 | if not opt.quiet: |
| 1369 | logger.info("Using manifest server %s", manifest_server) | 1368 | print("Using manifest server %s" % manifest_server) |
| 1370 | 1369 | ||
| 1371 | if "@" not in manifest_server: | 1370 | if "@" not in manifest_server: |
| 1372 | username = None | 1371 | username = None |
| @@ -1699,7 +1698,7 @@ later is required to fix a server side protocol bug. | |||
| 1699 | if opt.mp_update: | 1698 | if opt.mp_update: |
| 1700 | self._UpdateAllManifestProjects(opt, mp, manifest_name, errors) | 1699 | self._UpdateAllManifestProjects(opt, mp, manifest_name, errors) |
| 1701 | else: | 1700 | else: |
| 1702 | logger.info("Skipping update of local manifest project.") | 1701 | print("Skipping update of local manifest project.") |
| 1703 | 1702 | ||
| 1704 | # Now that the manifests are up-to-date, setup options whose defaults | 1703 | # Now that the manifests are up-to-date, setup options whose defaults |
| 1705 | # might be in the manifest. | 1704 | # might be in the manifest. |
| @@ -1855,7 +1854,7 @@ later is required to fix a server side protocol bug. | |||
| 1855 | ) | 1854 | ) |
| 1856 | 1855 | ||
| 1857 | if not opt.quiet: | 1856 | if not opt.quiet: |
| 1858 | logger.info("repo sync has finished successfully.") | 1857 | print("repo sync has finished successfully.") |
| 1859 | 1858 | ||
| 1860 | 1859 | ||
| 1861 | def _PostRepoUpgrade(manifest, quiet=False): | 1860 | def _PostRepoUpgrade(manifest, quiet=False): |
| @@ -1878,7 +1877,7 @@ def _PostRepoUpgrade(manifest, quiet=False): | |||
| 1878 | 1877 | ||
| 1879 | def _PostRepoFetch(rp, repo_verify=True, verbose=False): | 1878 | def _PostRepoFetch(rp, repo_verify=True, verbose=False): |
| 1880 | if rp.HasChanges: | 1879 | if rp.HasChanges: |
| 1881 | logger.info("info: A new version of repo is available") | 1880 | logger.warn("info: A new version of repo is available") |
| 1882 | wrapper = Wrapper() | 1881 | wrapper = Wrapper() |
| 1883 | try: | 1882 | try: |
| 1884 | rev = rp.bare_git.describe(rp.GetRevisionId()) | 1883 | rev = rp.bare_git.describe(rp.GetRevisionId()) |
| @@ -1900,15 +1899,13 @@ def _PostRepoFetch(rp, repo_verify=True, verbose=False): | |||
| 1900 | rp.work_git.reset("--keep", new_rev) | 1899 | rp.work_git.reset("--keep", new_rev) |
| 1901 | except GitError as e: | 1900 | except GitError as e: |
| 1902 | raise RepoUnhandledExceptionError(e) | 1901 | raise RepoUnhandledExceptionError(e) |
| 1903 | logger.info("info: Restarting repo with latest version") | 1902 | print("info: Restarting repo with latest version") |
| 1904 | raise RepoChangedException(["--repo-upgraded"]) | 1903 | raise RepoChangedException(["--repo-upgraded"]) |
| 1905 | else: | 1904 | else: |
| 1906 | logger.warning("warning: Skipped upgrade to unverified version") | 1905 | logger.warning("warning: Skipped upgrade to unverified version") |
| 1907 | else: | 1906 | else: |
| 1908 | if verbose: | 1907 | if verbose: |
| 1909 | logger.info( | 1908 | print("repo version %s is current", rp.work_git.describe(HEAD)) |
| 1910 | "repo version %s is current", rp.work_git.describe(HEAD) | ||
| 1911 | ) | ||
| 1912 | 1909 | ||
| 1913 | 1910 | ||
| 1914 | class _FetchTimes(object): | 1911 | class _FetchTimes(object): |
