Merge pull request hudson2-plugins#28 from kevinsawicki/to-string

Fix embedded quotes in verbose logging string

Author: magnayn

src/main/java/hudson/plugins/git/Revision.java

@@ -1,5 +1,9 @@
 package hudson.plugins.git;
 
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Iterables;
+
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -8,10 +12,10 @@
 import org.eclipse.jgit.lib.ObjectId;
 
 /**
- * A Revision is a SHA1 in the object tree, and the collection of branches
- * that share this ID. Unlike other SCMs, git can have >1 branches point
- * at the _same_ commit.
- *
+ * A Revision is a SHA1 in the object tree, and the collection of branches that
+ * share this ID. Unlike other SCMs, git can have >1 branches point at the
+ * _same_ commit.
+ * 
  * @author magnayn
  */
 @ExportedBean(defaultVisibility = 999)
@@ -63,15 +67,16 @@ public boolean containsBranchName(String name) {
     }
 
     public String toString() {
-        String s = "Revision " + sha1.name() + " (";
-        for (Branch br : branches) {
-            s += br.getName() + ", ";
-        }
-        if (s.endsWith(", "))
-            s = s.substring(0, s.length() - 2);
-        s += ")";
-
-        return s;
+        StringBuilder s = new StringBuilder("Revision " + sha1.name() + " (");
+        Joiner.on(", ").appendTo(s,
+                Iterables.transform(branches, new Function<Branch, String>() {
+
+                    public String apply(Branch from) {
+                        return from.getName();
+                    }
+                }));
+        s.append(')');
+        return s.toString();
     }
 
     @Override

src/main/java/hudson/plugins/git/util/DefaultBuildChooser.java

@@ -158,15 +158,15 @@ private Collection<Revision> getAdvancedCandidateRevisions(boolean isPollCall, T
         verbose(listener, "After non-tip filtering: {0}", revs);
 
         // 4. Finally, remove any revisions that have already been built.
-        verbose(listener, "Removing what's already been built: {0}", data.getBuildsByBranchName());
+        verbose(listener, "Removing what''s already been built: {0}", data.getBuildsByBranchName());
         for (Iterator<Revision> i = revs.iterator(); i.hasNext();) {
             Revision r = i.next();
 
             if (data.hasBeenBuilt(r.getSha1())) {
                 i.remove();
             }
         }
-        verbose(listener, "After filtering out what's already been built: {0}", revs);
+        verbose(listener, "After filtering out what''s already been built: {0}", revs);
 
         // if we're trying to run a build (not an SCM poll) and nothing new
         // was found then just run the last build again