use specific length for git changeset IDs

fixes #661

Author: vladak

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

@@ -55,6 +55,15 @@ public class GitRepository extends Repository {
     /** git blame command */
     private static final String BLAME = "blame";
 
+    /** arguments to shorten git IDs */
+    private static final int CSET_LEN = 8;
+    private static final String ABBREV_LOG = "--abbrev=" + CSET_LEN;
+    private static final String ABBREV_BLAME = "--abbrev=" + (CSET_LEN - 1);
+
+    /** Pattern used to extract author/revision from git blame. */
+    private static final Pattern BLAME_PATTERN =
+            Pattern.compile("^\\W*(\\w+).+?\\((\\D+).*$");
+
     public GitRepository() {
         type = "git";
         datePattern = "EEE MMM dd hh:mm:ss yyyy ZZZZ";
@@ -75,6 +84,7 @@ private String getCorrectPath(String fileName, String revision) throws IOExcepti
         ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
         cmd.add(this.cmd);
         cmd.add(BLAME);
+        cmd.add(ABBREV_BLAME);
         cmd.add("-C");
         cmd.add(fileName);
         File directory = new File(directoryName);
@@ -124,6 +134,7 @@ Executor getHistoryLogExecutor(final File file, String sinceRevision)
         cmd.add(this.cmd);
         cmd.add("log");
         cmd.add("--abbrev-commit");
+        cmd.add(ABBREV_LOG);
         cmd.add("--name-only");
         cmd.add("--pretty=fuller");
 
@@ -212,9 +223,6 @@ public InputStream getHistoryGet(String parent, String basename, String rev)
 
         return ret;
     }
-    /** Pattern used to extract author/revision from git blame. */
-    private static final Pattern BLAME_PATTERN =
-            Pattern.compile("^\\W*(\\w+).+?\\((\\D+).*$");
 
     /**
      * Annotate the specified file/revision.
@@ -229,6 +237,7 @@ public Annotation annotate(File file, String revision) throws IOException {
         ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
         cmd.add(this.cmd);
         cmd.add(BLAME);
+        cmd.add(ABBREV_BLAME);
         if (revision != null) {
             cmd.add(revision);
         }
@@ -243,6 +252,7 @@ public Annotation annotate(File file, String revision) throws IOException {
             ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
             cmd.add(this.cmd);
             cmd.add(BLAME);
+            cmd.add(ABBREV_BLAME);
             cmd.add("-C");
             cmd.add(file.getName());
             exec = new Executor(cmd, file.getParentFile());
@@ -264,6 +274,7 @@ public Annotation annotate(File file, String revision) throws IOException {
                         ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
                         cmd.add(this.cmd);
                         cmd.add(BLAME);
+                        cmd.add(ABBREV_BLAME);
                         if (revision != null) {
                             cmd.add(revision);
                         }

src/org/opensolaris/opengrok/index/Indexer.java

@@ -350,7 +350,7 @@ public static void main(String argv[]) {
                             if (arg[0].endsWith(".")) {
                                 arg[0] = arg[0].substring(0, arg[0].lastIndexOf('.')).toUpperCase();
                                 prefix = true;
-			    } else if (arg[0].startsWith(".")) {
+                            } else if (arg[0].startsWith(".")) {
                                 arg[0] = arg[0].substring(arg[0].lastIndexOf('.') + 1).toUpperCase();
                             } else {
                                 A_usage();

src/org/opensolaris/opengrok/search/Summarizer.java

@@ -21,7 +21,6 @@
 package org.opensolaris.opengrok.search;
 
 import java.io.IOException;
-import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;

src/org/opensolaris/opengrok/web/SearchHelper.java

@@ -246,7 +246,7 @@ public SearchHelper prepareExec(SortedSet<String> projects) {
         }
         // the Query created by the QueryBuilder
         try {
-	    indexDir=new File(dataRoot, "index");
+            indexDir=new File(dataRoot, "index");
             query = builder.build();
             if (projects == null) {
                 errorMsg = "No project selected!";