Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GlobalBuildInfo plugin should search packed references for commit IDs #47464

Merged
merged 4 commits into from
Oct 10, 2019
Merged

GlobalBuildInfo plugin should search packed references for commit IDs #47464

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b23d8b
GlobalBuildInfo plugin searches packed references
williamrandolph Oct 2, 2019
85dc407
Close file references and clean up variable names
williamrandolph Oct 2, 2019
8be8637
Merge changes from master
williamrandolph Oct 10, 2019
4b92470
Restore import dropped during merge
williamrandolph Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;

public class GlobalBuildInfoPlugin implements Plugin<Project> {
private static final String GLOBAL_INFO_EXTENSION_NAME = "globalInfo";
Expand Down Expand Up @@ -261,7 +264,23 @@ public static String gitRevision(File rootDir) {
}
final String ref = readFirstLine(head);
if (ref.startsWith("ref:")) {
revision = readFirstLine(gitDir.resolve(ref.substring("ref:".length()).trim()));
String refName = ref.substring("ref:".length()).trim();
Path refFile = gitDir.resolve(refName);
if (Files.exists(refFile)) {
revision = readFirstLine(refFile);
} else if (Files.exists(dotGit.resolve("packed-refs"))) {
// Check packed references for commit ID
Pattern p = Pattern.compile("^([a-f0-9]{40}) " + refName + "$");
try (Stream<String> lines = Files.lines(dotGit.resolve("packed-refs"))) {
revision = lines.map(p::matcher)
.filter(Matcher::matches)
.map(m -> m.group(1))
.findFirst()
.orElseThrow(() -> new IOException("Packed reference not found for refName " + refName));
}
} else {
throw new GradleException("Can't find revision for refName " + refName);
}
} else {
// we are in detached HEAD state
revision = ref;
Expand All @@ -274,8 +293,12 @@ public static String gitRevision(File rootDir) {
}

private static String readFirstLine(final Path path) throws IOException {
return Files.lines(path, StandardCharsets.UTF_8)
.findFirst()
.orElseThrow(() -> new IOException("file [" + path + "] is empty"));
String firstLine;
try (Stream<String> lines = Files.lines(path, StandardCharsets.UTF_8)) {
firstLine = lines
.findFirst()
.orElseThrow(() -> new IOException("file [" + path + "] is empty"));
}
return firstLine;
}
}