Merge pull request #1606 from vladak/mercurial_subdir_fix

when directory is specified for Mercurial history view, limit the log…

Author: tulinkry

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

@@ -193,6 +193,9 @@ Executor getHistoryLogExecutor(File file, String sinceRevision)
             // For files this does not matter since if getHistory() is called
             // for a file, the file has to be renamed so we want its complete history.
             cmd.add("--follow");
+        }
+
+        if (!filename.isEmpty()) {
             cmd.add(filename);
         }
 

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

@@ -115,6 +115,22 @@ public void testGetHistory() throws Exception {
         }
     }
 
+    @Test
+    public void testGetHistorySubdir() throws Exception {
+        setUpTestRepository();
+        File root = new File(repository.getSourceRoot(), "mercurial");
+
+        // Add a subdirectory with some history.
+        runHgCommand("import",
+            root, getClass().getResource("hg-export-subdir.txt").getPath());
+
+        MercurialRepository mr
+                = (MercurialRepository) RepositoryFactory.getRepository(root);
+        History hist = mr.getHistory(new File(root, "subdir"));
+        List<HistoryEntry> entries = hist.getHistoryEntries();
+        assertEquals(1, entries.size());
+    }
+
     /**
      * Test that subset of changesets can be extracted based on penultimate
      * revision number. This works for directories only.

test/org/opensolaris/opengrok/history/hg-export-subdir.txt

@@ -0,0 +1,13 @@
+# HG changeset patch
+# User Vladimir Kotal <[email protected]>
+# Date 1495469596 -7200
+#      Mon May 22 18:13:16 2017 +0200
+# Node ID c78fa757c524557fe29293c2a63480deb5c4f651
+# Parent  8b340409b3a81618750aa660cb113c65440688be
+add file in a subdir
+
+diff -r 8b340409b3a8 -r c78fa757c524 subdir/foo.txt
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/subdir/foo.txt	Mon May 22 18:13:16 2017 +0200
+@@ -0,0 +1,1 @@
++Monday, May 22, 2017 06:12:42 PM CEST