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

Jump to bottom

GlobalBuildInfo plugin should search packed references for commit IDs (#47464) #47942

Merged
merged 1 commit into from
Oct 14, 2019
Merged

GlobalBuildInfo plugin should search packed references for commit IDs (#47464) #47942

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 38 additions & 12 deletions buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ import java.time.ZoneOffset
import java.time.ZonedDateTime
import java.util.function.Supplier
import java.util.regex.Matcher
import java.util.regex.Pattern
import java.util.stream.Stream

/**
* Encapsulates build configuration for elasticsearch projects.
Expand Down Expand Up @@ -1118,7 +1120,26 @@ class BuildPlugin implements Plugin<Project> {
}
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-f1-9]{40}) " + refName + "\$")
Stream<String> lines = Files.lines(dotGit.resolve("packed-refs"));
try {
revision = lines.map( { s -> p.matcher(s) })
.filter( { m -> m.matches() })
.map({ m -> m.group(1) })
.findFirst()
.orElseThrow({ -> new IOException("Packed reference not found for refName " + refName) });
} finally {
lines.close()
}
} else {
throw new GradleException("Can't find revision for refName " + refName);
}
} else {
// we are in detached HEAD state
revision = ref;
Expand All @@ -1131,17 +1152,22 @@ class BuildPlugin implements Plugin<Project> {
}

private static String readFirstLine(final Path path) throws IOException {
return Files.lines(path, StandardCharsets.UTF_8)
.findFirst()
.orElseThrow(
new Supplier<IOException>() {

@Override
IOException get() {
return new IOException("file [" + path + "] is empty");
}

});
Stream lines = Files.lines(path, StandardCharsets.UTF_8)
try {
return Files.lines(path, StandardCharsets.UTF_8)
.findFirst()
.orElseThrow(
new Supplier<IOException>() {

@Override
IOException get() {
return new IOException("file [" + path + "] is empty");
}

});
} finally {
lines.close()
}
}

/** Configures the test task */
Expand Down