Skip to content

Exporting new SVN_REVISION_HIGHEST for projects with multiple svn modules #105

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

Closed
caspercba wants to merge 2 commits into from
Closed

Exporting new SVN_REVISION_HIGHEST for projects with multiple svn modules #105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
203eca2
New env variable exported: SVN_REVISION_HIGHEST
Dec 17, 2014
cad76e1
Fixed Long value revHighest initialization. Removed null check that i…
caspercba Dec 17, 2014
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
6 changes: 6 additions & 0 deletions src/main/java/hudson/scm/SubversionSCM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@ public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {
try {
Map<String,Long> revisions = parseSvnRevisionFile(build);
Set<String> knownURLs = revisions.keySet();
Long revHighest = new Long(0);
Copy link
Copy Markdown
Member

@oleg-nenashev oleg-nenashev Jul 9, 2015

Choose a reason for hiding this comment

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

Use long instead of Long

if(svnLocations.length==1) {
// for backwards compatibility if there's only a single modulelocation, we also set
// SVN_REVISION and SVN_URL without '_n'
Expand All @@ -685,6 +686,7 @@ public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {
if(rev!=null) {
env.put("SVN_REVISION",rev.toString());
env.put("SVN_URL",url);
revHighest = rev;
} else if (!knownURLs.isEmpty()) {
LOGGER.log(WARNING, "no revision found corresponding to {0}; known: {1}", new Object[] {url, knownURLs});
}
Expand All @@ -696,10 +698,14 @@ public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {
if(rev!=null) {
env.put("SVN_REVISION_"+(i+1),rev.toString());
env.put("SVN_URL_"+(i+1),url);
if (rev > revHighest) {
revHighest = rev;
}
} else if (!knownURLs.isEmpty()) {
LOGGER.log(WARNING, "no revision found corresponding to {0}; known: {1}", new Object[] {url, knownURLs});
}
}
env.put("SVN_REVISION_HIGHEST", revHighest.toString());

} catch (IOException e) {
LOGGER.log(WARNING, "error building environment variables", e);
Expand Down