support branches for Mercurial repository

fixes #865

Author: Vladimir Kotal

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

@@ -58,6 +58,8 @@ public class MercurialRepository extends Repository {
      */
     public static final String CMD_FALLBACK = "hg";
 
+    private String branch = null;
+
     /**
      * The boolean property and environment variable name to indicate
      * whether forest-extension in Mercurial adds repositories inside the
@@ -108,6 +110,24 @@ public MercurialRepository() {
         datePattern = "yyyy-MM-dd hh:mm ZZZZ";
     }
 
+    /** Return name of the branch or "default" */
+    private String getBranch() {
+        if (branch == null) {
+            List<String> cmd = new ArrayList<String>();
+            ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
+            cmd.add(this.cmd);
+            cmd.add("branch");
+
+            Executor e = new Executor(cmd, new File(directoryName));
+            e.exec();
+
+            String output = e.getOutputString();
+            branch = output.trim();
+        }
+
+        return branch;
+    }
+
     /**
      * Get an executor to be used for retrieving the history log for the
      * named file or directory.
@@ -140,16 +160,21 @@ Executor getHistoryLogExecutor(File file, String changeset)
             cmd.add("-f");
         }
 
+        // If this is non-default branch we would like to get the changesets
+        // on that branch and also any changesets from the parent branch(es).
         if (changeset != null) {
             cmd.add("-r");
             String[] parts = changeset.split(":");
             if (parts.length == 2) {
-                cmd.add("tip:" + parts[0]);
+                cmd.add("reverse(" + parts[0] + "::'" + getBranch() + "')");
             } else {
                 throw new HistoryException(
                         "Don't know how to parse changeset identifier: " +
                         changeset);
             }
+        } else {
+            cmd.add("-r");
+            cmd.add("reverse(0::'" + getBranch() + "')");
         }
 
         cmd.add("--template");

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

@@ -147,7 +147,8 @@ void removeAndVerifyOldestChangeset(List<HistoryEntry> entries,
         // and compare more fields, like author and date.
         if (entry == null || !revision.equals(entry.getRevision())) {
             throw new HistoryException("Cached revision '" + revision +
-                                       "' not found in the repository");
+                                       "' not found in the repository " +
+                                       getDirectoryName());
         }
     }
 

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

@@ -62,26 +62,6 @@ public class FileHistoryCacheTest extends TestCase {
 
         cache = null;
     }
-    
-    /**
-     * Import a new changeset into a Mercurial repository.
-     *
-     * @param reposRoot the root of the repository
-     * @param changesetFile file that contains the changesets to import
-     */
-    private void importHgChangeset(File reposRoot, String changesetFile) {
-        String[] cmdargs = {
-            MercurialRepository.CMD_FALLBACK, "import", changesetFile
-        };
-        Executor exec = new Executor(Arrays.asList(cmdargs), reposRoot);
-        int exitCode = exec.exec();
-        if (exitCode != 0) {
-            fail("hg import failed." +
-                    "\nexit code: " + exitCode +
-                    "\nstdout:\n" + exec.getOutputString() +
-                    "\nstderr:\n" + exec.getErrorString());
-        }
-    }
 
     /**
      * Assert that two HistoryEntry objects are equal.
@@ -160,7 +140,7 @@ public void testStoreAndGetIncrementalTags() throws Exception {
         cache.store(historyToStore, repo);
 
         // Add bunch of changesets with file based changes and tags.
-        importHgChangeset(
+        MercurialRepositoryTest.runHgCommand("import",
             reposRoot, getClass().getResource("hg-export-tag.txt").getPath());
 
         // Perform incremental reindex.
@@ -286,8 +266,7 @@ public void testStoreAndGet() throws Exception {
                 dirHistory.getHistoryEntries(), true);
 
         // test incremental update
-
-        importHgChangeset(
+        MercurialRepositoryTest.runHgCommand("import",
                 reposRoot, getClass().getResource("hg-export.txt").getPath());
 
         repo.createCache(cache, cache.getLatestCachedRevision(repo));
@@ -347,7 +326,7 @@ public void testRenamedFile() throws Exception {
         cache.store(historyToStore, repo);
 
         // import changesets which rename one of the files
-        importHgChangeset(
+        MercurialRepositoryTest.runHgCommand("import",
             reposRoot, getClass().getResource("hg-export-renamed.txt").getPath());
 
         // reindex

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

@@ -26,11 +26,16 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import static junit.framework.Assert.fail;
 import org.junit.After;
 import org.junit.Test;
 import org.opensolaris.opengrok.util.TestRepository;
 import static org.junit.Assert.*;
+import org.opensolaris.opengrok.util.Executor;
 
 /**
  * Tests for MercurialRepository.
@@ -48,6 +53,12 @@ public class MercurialRepositoryTest {
         "5:8706402863c6", "4:e494d67af12f", "3:2058725c1470",
         "2:585a1b3f2efb", "1:f24a5fd7a85d", "0:816b6279ae9c"
     };
+
+    // extra revisions for branch test
+    private static final String[] REVISIONS_extra_branch = {
+        "10:c4518ca0c841"
+    };
+
     // novel.txt (or its ancestors) existed only since revision 3
     private static final String[] REVISIONS_novel = {
         "9:8b340409b3a8",
@@ -118,7 +129,73 @@ public void testGetHistoryPartial() throws Exception {
             assertNotNull(e.getMessage());
         }
     }
-    
+
+    /**
+     * Run Mercurial command.
+     * @param command hg command to run
+     * @param reposRoot directory of the repository root
+     * @param arg argument to use for the command
+     */
+    static void runHgCommand(String command, File reposRoot, String arg) {
+        String[] cmdargs = {
+            MercurialRepository.CMD_FALLBACK, command, arg
+        };
+        Executor exec = new Executor(Arrays.asList(cmdargs), reposRoot);
+        int exitCode = exec.exec();
+        if (exitCode != 0) {
+            fail("hg " + command + " failed." +
+                    "\nexit code: " + exitCode +
+                    "\nstdout:\n" + exec.getOutputString() +
+                    "\nstderr:\n" + exec.getErrorString());
+        }
+    }
+
+    /**
+     * Test that history of branched repository contains changesets of the
+     * default branch as well.
+     * @throws Exception
+     */
+    @Test
+    public void testGetHistoryBranch() throws Exception {
+        setUpTestRepository();
+        File root = new File(repository.getSourceRoot(), "mercurial");
+        MercurialRepository mr =
+                (MercurialRepository) RepositoryFactory.getRepository(root);
+
+        // Branch the repo and add one changeset.
+        runHgCommand("unbundle",
+            root, getClass().getResource("hg-branch.bundle").getPath());
+        // Switch to the branch.
+        runHgCommand("update", root, "mybranch");
+
+        // Get all revisions.
+        History hist = mr.getHistory(root);
+        List<HistoryEntry> entries = hist.getHistoryEntries();
+        List<String> both = new ArrayList<String>(REVISIONS.length +
+            REVISIONS_extra_branch.length);
+        Collections.addAll(both, REVISIONS_extra_branch);
+        Collections.addAll(both, REVISIONS);
+        String revs[] = both.toArray(new String[both.size()]);
+        assertEquals(revs.length, entries.size());
+        // Ideally we should check that the last revision is branched but
+        // there is currently no provision for that in HistoryEntry object.
+        for (int i = 0; i < entries.size(); i++) {
+            HistoryEntry e = entries.get(i);
+            assertEquals(revs[i], e.getRevision());
+            assertNotNull(e.getAuthor());
+            assertNotNull(e.getDate());
+            assertNotNull(e.getFiles());
+            assertNotNull(e.getMessage());
+        }
+
+        // Get revisions starting with given changeset before the repo was branched.
+        hist = mr.getHistory(root, "8:6a8c423f5624");
+        entries = hist.getHistoryEntries();
+        assertEquals(2, entries.size());
+        assertEquals(REVISIONS_extra_branch[0], entries.get(0).getRevision());
+        assertEquals(REVISIONS[0], entries.get(1).getRevision());
+    }
+
     /**
      * Test that it is possible to get contents of last revision of a text
      * file.