use template

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/history/MercurialAnnotationParser.java

@@ -52,8 +52,10 @@ class MercurialAnnotationParser implements Executor.StreamHandler {
 
     /**
      * Pattern used to extract author/revision from the {@code hg annotate} command.
+     * Obviously, this has to be in concordance with the output template used by
+     * {@link MercurialRepository#annotate(File, String)}.
      */
-    private static final Pattern ANNOTATION_PATTERN = Pattern.compile("^(\\d+)\\s+([0-9a-f]+):");
+    private static final Pattern ANNOTATION_PATTERN = Pattern.compile("^(\\d+)\\t([0-9a-f]+):");
 
     MercurialAnnotationParser(File file, @NotNull HashMap<String, HistoryEntry> revs) {
         this.file = file;

opengrok-indexer/src/main/java/org/opengrok/indexer/history/MercurialRepository.java

@@ -322,8 +322,7 @@ private HistoryRevResult getHistoryRev(BufferSink sink, String fullpath, String
      * of a file in historical revision.
      *
      * @param fullpath file path
-     * @param fullRevToFind revision number (in the form of
-     * {rev}:{node|short})
+     * @param fullRevToFind revision number (in the form of <code>{rev}:{node|short}</code>)
      * @return original filename
      */
     private String findOriginalName(String fullpath, String fullRevToFind) throws IOException {
@@ -464,8 +463,11 @@ public Annotation annotate(File file, String revision) throws IOException {
         ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
         argv.add(RepoCommand);
         argv.add("annotate");
-        argv.add("-n");
-        argv.add("-c"); // TODO: use --template ?
+        argv.add("--template");
+        /*
+         * This has to be in concordance with TEMPLATE_REVS, in particular the format of the 'node'.
+         */
+        argv.add("{lines % '{rev}\t{node|short}:{line}'}");
         if (!this.isHandleRenamedFiles()) {
             argv.add("--no-follow");
         }