From 6b8e9fc8db47a29dbb288cb2109a78e2518e616a Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Wed, 18 Jun 2025 14:38:28 -0700 Subject: [PATCH] sync: clarify job flags when using interleaved --jobs-network and --jobs-checkout are ignored with --interleaved. Bug: 421935613 Change-Id: Ib69413993c4f970b385bd09318972716e5ac3324 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/485021 Tested-by: Gavin Mak Commit-Queue: Gavin Mak Reviewed-by: Scott Lee --- man/repo-smartsync.1 | 5 +++-- man/repo-sync.1 | 5 +++-- subcmds/sync.py | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/man/repo-smartsync.1 b/man/repo-smartsync.1 index 6e77f182..dd36df01 100644 --- a/man/repo-smartsync.1 +++ b/man/repo-smartsync.1 @@ -20,11 +20,12 @@ number of CPU cores) .TP \fB\-\-jobs\-network\fR=\fI\,JOBS\/\fR number of network jobs to run in parallel (defaults to -\fB\-\-jobs\fR or 1) +\fB\-\-jobs\fR or 1). Ignored when \fB\-\-interleaved\fR is set .TP \fB\-\-jobs\-checkout\fR=\fI\,JOBS\/\fR number of local checkout jobs to run in parallel -(defaults to \fB\-\-jobs\fR or 8) +(defaults to \fB\-\-jobs\fR or 8). Ignored when \fB\-\-interleaved\fR +is set .TP \fB\-f\fR, \fB\-\-force\-broken\fR obsolete option (to be deleted in the future) diff --git a/man/repo-sync.1 b/man/repo-sync.1 index afaee2af..6e9dd8ad 100644 --- a/man/repo-sync.1 +++ b/man/repo-sync.1 @@ -20,11 +20,12 @@ number of CPU cores) .TP \fB\-\-jobs\-network\fR=\fI\,JOBS\/\fR number of network jobs to run in parallel (defaults to -\fB\-\-jobs\fR or 1) +\fB\-\-jobs\fR or 1). Ignored when \fB\-\-interleaved\fR is set .TP \fB\-\-jobs\-checkout\fR=\fI\,JOBS\/\fR number of local checkout jobs to run in parallel -(defaults to \fB\-\-jobs\fR or 8) +(defaults to \fB\-\-jobs\fR or 8). Ignored when \fB\-\-interleaved\fR +is set .TP \fB\-f\fR, \fB\-\-force\-broken\fR obsolete option (to be deleted in the future) diff --git a/subcmds/sync.py b/subcmds/sync.py index f0c398a3..e75a8154 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -411,7 +411,7 @@ later is required to fix a server side protocol bug. type=int, metavar="JOBS", help="number of network jobs to run in parallel (defaults to " - "--jobs or 1)", + "--jobs or 1). Ignored when --interleaved is set", ) p.add_option( "--jobs-checkout", @@ -419,7 +419,8 @@ later is required to fix a server side protocol bug. type=int, metavar="JOBS", help="number of local checkout jobs to run in parallel (defaults " - f"to --jobs or {DEFAULT_LOCAL_JOBS})", + f"to --jobs or {DEFAULT_LOCAL_JOBS}). Ignored when --interleaved " + "is set", ) p.add_option(