Skip to content

Small improvement on GitBranchHash which is able to get at least the hash of a detached HEAD #3334

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

Merged
lkishalmi merged 1 commit into from
Nov 26, 2021
Merged

Small improvement on GitBranchHash which is able to get at least the hash of a detached HEAD #3334

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
33 changes: 21 additions & 12 deletions nbbuild/antsrc/org/netbeans/nbbuild/GitBranchHash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,31 +79,40 @@ public void execute() throws BuildException {
if (headroot != null && Files.size(headroot) > 0l) {
List<String> lines = Files.readAllLines(headroot);
String line = lines.get(0);
String revLink = line.substring(line.indexOf(':')+1).trim();
branch = revLink.substring(revLink.lastIndexOf('/')+1).trim();
Path revPath = headroot.getParent().resolve(revLink);
if(Files.isRegularFile(revPath) && Files.size(revPath) > 0l) {
List<String> revlines = Files.readAllLines(revPath);
String revline = revlines.get(0);
if(revline.length()>=12){
hash = revline.trim();
if (!line.contains(":") && (line.length() == 40)) {

@neilcsmith-net neilcsmith-net Nov 26, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this should be >= 40 and also trimmed? I have also no idea if >= 12 was just copying from HgID or necessary. 🤷

@lkishalmi lkishalmi Nov 26, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not know that either. Just made some adjustments to work with a detached head.

//Detached HEAD
hash = line;
log("Detached HEAD please specify '" + branchProperty + "' externally.", Project.MSG_WARN);
} else {
String revLink = line.substring(line.indexOf(':')+1).trim();
branch = revLink.substring(revLink.lastIndexOf('/')+1).trim();
Path revPath = headroot.getParent().resolve(revLink);
if(Files.isRegularFile(revPath) && Files.size(revPath) > 0l) {
List<String> revlines = Files.readAllLines(revPath);
String revline = revlines.get(0);
if(revline.length()>=12){
hash = revline.trim();
} else {
log("no content in " + revPath, Project.MSG_WARN);
}
} else {
log("no content in " + revPath, Project.MSG_WARN);
log("unable to find revision info for " + revPath, Project.MSG_WARN);
}
} else {
log("unable to find revision info for " + revPath, Project.MSG_WARN);
}
} else {
log("No HEAD found starting from " + file, Project.MSG_WARN);
}
} catch(IOException ex) {
log("Could not read " + headroot + ": " + ex, Project.MSG_WARN);
}
if (!branch.isEmpty() && !hash.isEmpty()) {
if (!branch.isEmpty()) {
getProject().setNewProperty(branchProperty, branch);
}
if (!hash.isEmpty()) {
getProject().setNewProperty(hashProperty, hash);
}

}

}