Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Commit

Permalink
Noting JENKINS-31838.
Browse files Browse the repository at this point in the history
  • Loading branch information
jglick committed Feb 7, 2016
1 parent 21c9078 commit 0b1b639
Showing 1 changed file with 2 additions and 1 deletion.
Expand Up @@ -183,7 +183,7 @@ public String getDiff() {
return "???";
}
try {
StringBuilder diff = new StringBuilder(diff("Jenkinsfile", originalAction.getOriginalScript(), getOriginalScript()));
StringBuilder diff = new StringBuilder(diff(/* TODO JENKINS-31838 */"Jenkinsfile", originalAction.getOriginalScript(), getOriginalScript()));
Map<String,String> originalLoadedScripts = originalAction.getOriginalLoadedScripts();
for (Map.Entry<String,String> entry : getOriginalLoadedScripts().entrySet()) {
String script = entry.getKey();
Expand All @@ -199,6 +199,7 @@ public String getDiff() {
}
private static String diff(String script, String oldText, String nueText) throws IOException {
Diff hunks = Diff.diff(new StringReader(oldText), new StringReader(nueText), false);
// TODO rather than old vs. new could use (e.g.) build-10 vs. build-13
return hunks.isEmpty() ? "" : hunks.toUnifiedDiff("old/" + script, "new/" + script, new StringReader(oldText), new StringReader(nueText), 3);
}

Expand Down

0 comments on commit 0b1b639

Please sign in to comment.