Skip to content

Commit e5e01e6

Browse files
committed
minor: send fewer subprocess message to stderr
1 parent a7e1f86 commit e5e01e6

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

nixpkgs_review/review.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,11 @@ def worktree_dir(self) -> str:
131131
return str(self.builddir.worktree_dir)
132132

133133
def git_merge(self, commit: str) -> None:
134-
sh(["git", "merge", "--no-commit", "--no-ff", commit], cwd=self.worktree_dir())
134+
sh(
135+
["git", "merge", "--no-commit", "--no-ff", commit],
136+
cwd=self.worktree_dir(),
137+
stderr=sys.stdout,
138+
)
135139

136140
def apply_unstaged(self, staged: bool = False) -> None:
137141
args = ["git", "--no-pager", "diff"]
@@ -145,7 +149,9 @@ def apply_unstaged(self, staged: bool = False) -> None:
145149
sys.exit(0)
146150

147151
info("Applying `nixpkgs` diff...")
148-
result = subprocess.run(["git", "apply"], cwd=self.worktree_dir(), input=diff)
152+
result = subprocess.run(
153+
["git", "apply"], cwd=self.worktree_dir(), input=diff, stderr=sys.stdout
154+
)
149155

150156
if result.returncode != 0:
151157
warn("Failed to apply diff in %s" % self.worktree_dir())
@@ -172,10 +178,11 @@ def build_commit(
172178
changed_pkgs, removed_pkgs = differences(base_packages, merged_packages)
173179
changed_attrs = set(p.attr_path for p in changed_pkgs)
174180
print_updates(changed_pkgs, removed_pkgs)
181+
175182
return self.build(changed_attrs, self.build_args)
176183

177184
def git_worktree(self, commit: str) -> None:
178-
sh(["git", "worktree", "add", self.worktree_dir(), commit])
185+
sh(["git", "worktree", "add", self.worktree_dir(), commit], stderr=sys.stdout)
179186

180187
def checkout_pr(self, base_rev: str, pr_rev: str) -> None:
181188
if self.checkout == CheckoutOption.MERGE:
@@ -216,6 +223,7 @@ def build_pr(self, pr_number: int) -> List[Attr]:
216223
["git", "merge-base", merge_rev, pr_rev],
217224
check=True,
218225
stdout=subprocess.PIPE,
226+
stderr=sys.stdout,
219227
text=True,
220228
)
221229
base_rev = run.stdout.strip()
@@ -438,11 +446,13 @@ def fetch_refs(repo: str, *refs: str) -> List[str]:
438446
cmd = ["git", "-c", "fetch.prune=false", "fetch", "--force", repo]
439447
for i, ref in enumerate(refs):
440448
cmd.append(f"{ref}:refs/nixpkgs-review/{i}")
441-
sh(cmd)
449+
sh(cmd, stderr=sys.stdout)
442450
shas = []
443451
for i, ref in enumerate(refs):
444452
out = subprocess.check_output(
445-
["git", "rev-parse", "--verify", f"refs/nixpkgs-review/{i}"], text=True
453+
["git", "rev-parse", "--verify", f"refs/nixpkgs-review/{i}"],
454+
text=True,
455+
stderr=sys.stdout,
446456
)
447457
shas.append(out.strip())
448458
return shas

0 commit comments

Comments
 (0)