unify output format for repository current version

Author: vladak

src/org/opensolaris/opengrok/history/GitRepository.java

@@ -704,8 +704,6 @@ String determineBranch() throws IOException {
         return branch;
     }
 
-    private static final SimpleDateFormat outputDateFormat = new SimpleDateFormat("YYYY-MM-dd HH:mm");
-
     @Override
     public String determineCurrentVersion() throws IOException {
         File directory = new File(directoryName);
@@ -737,8 +735,8 @@ public String determineCurrentVersion() throws IOException {
 
         try {
             Date date = getDateFormat().parse(output.substring(0, indexOf));
-            return String.format("%s%s",
-                    new Object[]{outputDateFormat.format(date), output.substring(indexOf)});
+            return String.format("%s %s",
+                    new Object[]{outputDateFormat.format(date), output.substring(indexOf + 1)});
         } catch (ParseException ex) {
             throw new IOException(ex);
         }

src/org/opensolaris/opengrok/history/MercurialRepository.java

@@ -713,7 +713,7 @@ public String determineCurrentVersion() throws IOException {
         cmd.add("-l");
         cmd.add("1");
         cmd.add("--template");
-        cmd.add("{date|isodate}: {node|short} {author} {desc|strip}");
+        cmd.add("{date|isodate} {node|short} {author} {desc|strip}");
 
         Executor executor = new Executor(cmd, directory);
         if (executor.exec(false) != 0) {

src/org/opensolaris/opengrok/history/RepositoryInfo.java

@@ -23,6 +23,7 @@
 package org.opensolaris.opengrok.history;
 
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
 
 /**
  * Class to contain the common info for a repository. This object will live on
@@ -44,6 +45,11 @@ public class RepositoryInfo implements Serializable {
     protected String branch;
     protected String currentVersion;
 
+    /**
+     * format used for printing the date in {@code currentVersion}
+     */
+    protected static final SimpleDateFormat outputDateFormat = new SimpleDateFormat("YYYY-MM-dd HH:mm Z");
+
     /**
      * Empty constructor to support serialization.
      */

src/org/opensolaris/opengrok/history/SubversionRepository.java

@@ -494,8 +494,9 @@ public String determineCurrentVersion() throws IOException {
         try {
             History hist = getHistory(new File(getDirectoryName()), null, 1);
             HistoryEntry he = hist.getHistoryEntries().get(0);
-            curVersion = he.getDate() + ": " + he.getRevision() +
-                    " " + he.getAuthor() + " " + he.getMessage();
+            curVersion = outputDateFormat.format(he.getDate()) + " " +
+                    he.getRevision() + " " + he.getAuthor() + " " +
+                    he.getMessage();
         } catch (HistoryException ex) {
             LOGGER.log(Level.WARNING, "cannot get current version info for {0}",
                     getDirectoryName());