From e56181bcfcf12ab4242296f401d2205088801416 Mon Sep 17 00:00:00 2001 From: Kelvin Ou Date: Sun, 30 Nov 2025 13:47:03 +0000 Subject: [PATCH 1/4] improve logging --- .../palantir/javaformat/gradle/FormatDiff.java | 6 +++++- gradle/.DS_Store | Bin 0 -> 6148 bytes 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 gradle/.DS_Store diff --git a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java index d12907dc7..6979cbb64 100644 --- a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java +++ b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java @@ -134,7 +134,11 @@ private static String gitCommand(Path dir, String... args) throws IOException, I new ProcessBuilder().command(args).directory(dir.toFile()).start(); Preconditions.checkState(process.waitFor(30, TimeUnit.SECONDS), "git diff took too long to terminate"); - Preconditions.checkState(process.exitValue() == 0, "Expected return code of 0"); + Preconditions.checkState( + process.exitValue() == 0, + "Expected return code of 0 but got " + process.exitValue() + + "\n stdout: " + new String(process.getInputStream().readAllBytes()) + + "\n stderr: " + new String(process.getErrorStream().readAllBytes())); ByteArrayOutputStream baos = new ByteArrayOutputStream(); process.getInputStream().transferTo(baos); diff --git a/gradle/.DS_Store b/gradle/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..db38dd897b3311739a00ce5dc5667ccec23cc30a GIT binary patch literal 6148 zcmeHKOHRWu5FNLXNQDFyD^|!`y6X*06;99#KnVgtqeMjrmN^L*;1cXO4>#bAXB1*W zSt0~8)%ZE{v7MJF(;*_axG(2KQzFWtjH3yLFNFQ90~x7>osQR7U(J^nb=3?a&G1_p z;AfZ74V83Dcj@!n+wc3Tx+qrbdIeklbbRo5M6V~Qzx>wUT=(9MaX>2V&;xDgoErQt zX_M~${5Fi}pJCQ?XZW;ERezjhdsK2Bdg1e!7z4(DG4Nj)K+R^!cLi-U28;n?pksi) z4<5=G6kEag>A(r1WXrnP;45SQ<<#NjP|8#r*pC;LrF<=b*DF$3tEQ Date: Mon, 1 Dec 2025 09:15:22 +0000 Subject: [PATCH 2/4] don't consume stdout if not error --- .../com/palantir/javaformat/gradle/FormatDiff.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java index 6979cbb64..ae68a27c3 100644 --- a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java +++ b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java @@ -134,12 +134,11 @@ private static String gitCommand(Path dir, String... args) throws IOException, I new ProcessBuilder().command(args).directory(dir.toFile()).start(); Preconditions.checkState(process.waitFor(30, TimeUnit.SECONDS), "git diff took too long to terminate"); - Preconditions.checkState( - process.exitValue() == 0, - "Expected return code of 0 but got " + process.exitValue() - + "\n stdout: " + new String(process.getInputStream().readAllBytes()) - + "\n stderr: " + new String(process.getErrorStream().readAllBytes())); - + if (process.exitValue() != 0) { + throw new IllegalStateException("Expected return code of 0 but got " + process.exitValue() + + "\n stdout: " + new String(process.getInputStream().readAllBytes()) + + "\n stderr: " + new String(process.getErrorStream().readAllBytes())); + } ByteArrayOutputStream baos = new ByteArrayOutputStream(); process.getInputStream().transferTo(baos); return new String(baos.toByteArray(), UTF_8).trim(); From 8f847cea6e5828057ac4a056955c8a0c7eef9222 Mon Sep 17 00:00:00 2001 From: Kelvin Ou Date: Mon, 1 Dec 2025 10:30:47 +0000 Subject: [PATCH 3/4] yikes --- gradle/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gradle/.DS_Store diff --git a/gradle/.DS_Store b/gradle/.DS_Store deleted file mode 100644 index db38dd897b3311739a00ce5dc5667ccec23cc30a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5FNLXNQDFyD^|!`y6X*06;99#KnVgtqeMjrmN^L*;1cXO4>#bAXB1*W zSt0~8)%ZE{v7MJF(;*_axG(2KQzFWtjH3yLFNFQ90~x7>osQR7U(J^nb=3?a&G1_p z;AfZ74V83Dcj@!n+wc3Tx+qrbdIeklbbRo5M6V~Qzx>wUT=(9MaX>2V&;xDgoErQt zX_M~${5Fi}pJCQ?XZW;ERezjhdsK2Bdg1e!7z4(DG4Nj)K+R^!cLi-U28;n?pksi) z4<5=G6kEag>A(r1WXrnP;45SQ<<#NjP|8#r*pC;LrF<=b*DF$3tEQ Date: Mon, 1 Dec 2025 10:47:28 +0000 Subject: [PATCH 4/4] asdf --- .../main/java/com/palantir/javaformat/gradle/FormatDiff.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java index ae68a27c3..ec4fb6abd 100644 --- a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java +++ b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java @@ -135,7 +135,7 @@ private static String gitCommand(Path dir, String... args) throws IOException, I Preconditions.checkState(process.waitFor(30, TimeUnit.SECONDS), "git diff took too long to terminate"); if (process.exitValue() != 0) { - throw new IllegalStateException("Expected return code of 0 but got " + process.exitValue() + throw new RuntimeException("Expected return code of 0 but got " + process.exitValue() + "\n stdout: " + new String(process.getInputStream().readAllBytes()) + "\n stderr: " + new String(process.getErrorStream().readAllBytes())); }