Merge pull request #1700 from vladak/git_datefix_redux

determineCurrentVersion() in git repository needs to use iso-strict too

Author: tulinkry

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

@@ -78,6 +78,12 @@ public class GitRepository extends Repository {
     private static final String ABBREV_LOG = "--abbrev=" + CSET_LEN;
     private static final String ABBREV_BLAME = "--abbrev=" + (CSET_LEN - 1);
 
+    /**
+     * All git commands that emit date that needs to be parsed by
+     * {@code getDateFormat()} should use this option.
+     */
+    private static final String GIT_DATE_OPT = "--date=iso8601-strict";
+
     /**
      * Pattern used to extract author/revision from git blame.
      */
@@ -123,7 +129,7 @@ Executor getHistoryLogExecutor(final File file, String sinceRevision)
         cmd.add(ABBREV_LOG);
         cmd.add("--name-only");
         cmd.add("--pretty=fuller");
-        cmd.add("--date=iso8601-strict");
+        cmd.add(GIT_DATE_OPT);
 
         if (file.isFile() && RuntimeEnvironment.getInstance().isHandleHistoryOfRenamedFiles()) {
             cmd.add("--follow");
@@ -704,20 +710,25 @@ String determineBranch() throws IOException {
     String determineCurrentVersion() throws IOException {
         File directory = new File(directoryName);
         List<String> cmd = new ArrayList<>();
+        // The delimiter must not be contained in the date format emitted by
+        // {@code GIT_DATE_OPT}.
+        String delim = "#";
+
         ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
+
         cmd.add(RepoCommand);
         cmd.add("log");
         cmd.add("-1");
-        cmd.add("--pretty=%cd: %h %an %s");
-        cmd.add("--date=rfc");
+        cmd.add("--pretty=%cd" + delim + "%h %an %s");
+        cmd.add(GIT_DATE_OPT);
 
         Executor executor = new Executor(cmd, directory);
         if (executor.exec(false) != 0) {
             throw new IOException(executor.getErrorString());
         }
 
         String output = executor.getOutputString().trim();
-        int indexOf = StringUtils.nthIndexOf(output, ":", 3);
+        int indexOf = StringUtils.nthIndexOf(output, delim, 1);
         if (indexOf < 0) {
             throw new IOException(
                     String.format("Couldn't extract date from \"%s\".",

test/org/opensolaris/opengrok/history/GitRepositoryTest.java

@@ -77,6 +77,15 @@ public void tearDown() {
         instance = null;
     }
 
+    @Test
+    public void testDetermineCurrentVersion() throws Exception {
+        File root = new File(repository.getSourceRoot(), "git");
+        GitRepository gitrepo
+                = (GitRepository) RepositoryFactory.getRepository(root);
+        String ver = gitrepo.determineCurrentVersion();
+        Assert.assertNotNull(ver);
+    }
+
     /**
      * Test of parseAnnotation method, of class GitRepository.
      * @throws java.lang.Exception