From 218600eeb02bffe0edde81163c1aa01c70ec0eee Mon Sep 17 00:00:00 2001 From: Erik Helin Date: Thu, 28 Nov 2019 11:28:23 +0100 Subject: [PATCH] 174: git-webrev should support taking file list via STDIN --- .../main/java/org/openjdk/skara/args/ArgumentParser.java | 2 +- cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/args/src/main/java/org/openjdk/skara/args/ArgumentParser.java b/args/src/main/java/org/openjdk/skara/args/ArgumentParser.java index 1709dd781..1890cfa7d 100644 --- a/args/src/main/java/org/openjdk/skara/args/ArgumentParser.java +++ b/args/src/main/java/org/openjdk/skara/args/ArgumentParser.java @@ -181,7 +181,7 @@ public Arguments parse(String[] args) { } seen.add(flag); } - } else if (arg.startsWith("-")) { + } else if (arg.startsWith("-") && !arg.equals("-")) { var name = arg.substring(1); var flag = lookupShortcut(name); if (flag.isSwitch()) { diff --git a/cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java b/cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java index a7daf9f00..77e4425db 100644 --- a/cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java +++ b/cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java @@ -256,8 +256,14 @@ private static void generate(String[] args) throws IOException { List files = List.of(); if (arguments.at(0).isPresent()) { var path = arguments.at(0).via(Path::of); - files = Files.readAllLines(path).stream().map(Path::of).collect(Collectors.toList()); + if (path.equals(Path.of("-"))) { + var reader = new BufferedReader(new InputStreamReader(System.in)); + files = reader.lines().map(Path::of).collect(Collectors.toList()); + } else { + files = Files.readAllLines(path).stream().map(Path::of).collect(Collectors.toList()); + } } + Webrev.repository(repo) .output(output) .title(title)