forall: allow interactive commands with -j1
Historically forall has been interactive since it ran in serial.
Recent rework in here dropped that to enable parallel processing.
Restore support for interactive commands when running -j1 or with
an explicit --interactive option.
Bug: https://crbug.com/gerrit/14256
Change-Id: I502007186f771914cfd7830846a4e1938b5e1f38
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/300722
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
diff --git a/subcmds/forall.py b/subcmds/forall.py
index 3e879fb..872c95c 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -52,6 +52,11 @@
The -r option allows running the command only on projects matching
regex or wildcard expression.
+By default, projects are processed non-interactively in parallel. If you want
+to run interactive commands, make sure to pass --interactive to force --jobs 1.
+While the processing order of projects is not guaranteed, the order of project
+output is stable.
+
# Output Formatting
The -p option causes '%prog' to bind pipes to the command's stdin,
@@ -154,6 +159,9 @@
g.add_option('-v', '--verbose',
dest='verbose', action='store_true',
help='Show command error messages')
+ p.add_option('--interactive',
+ action='store_true',
+ help='force interactive usage')
def WantPager(self, opt):
return opt.project_header and opt.jobs == 1
@@ -173,6 +181,11 @@
cmd.append(cmd[0])
cmd.extend(opt.command[1:])
+ # Historically, forall operated interactively, and in serial. If the user
+ # has selected 1 job, then default to interacive mode.
+ if opt.jobs == 1:
+ opt.interactive = True
+
if opt.project_header \
and not shell \
and cmd[0] == 'git':
@@ -313,10 +326,12 @@
else:
stderr = subprocess.DEVNULL
+ stdin = None if opt.interactive else subprocess.DEVNULL
+
result = subprocess.run(
cmd, cwd=cwd, shell=shell, env=env, check=False,
encoding='utf-8', errors='replace',
- stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=stderr)
+ stdin=stdin, stdout=subprocess.PIPE, stderr=stderr)
output = result.stdout
if opt.project_header:
