get complete history of files in CVS repository (across branch points)

fixes #1633

Author: vladak

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

@@ -31,7 +31,10 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -50,7 +53,7 @@ private enum ParseState {
     }
 
     private History history;
-    private CVSRepository repository = new CVSRepository();
+    private CVSRepository cvsrepo = new CVSRepository();
 
    /**
      * Process the output from the log command and insert the HistoryEntries
@@ -61,7 +64,7 @@ private enum ParseState {
      */
     @Override
     public void processStream(InputStream input) throws IOException {
-        DateFormat df = repository.getDateFormat();
+        DateFormat df = cvsrepo.getDateFormat();
         ArrayList<HistoryEntry> entries = new ArrayList<HistoryEntry>();
 
         BufferedReader in = new BufferedReader(new InputStreamReader(input));
@@ -169,9 +172,9 @@ public void processStream(InputStream input) throws IOException {
      * @return object representing the file's history
      */
     History parse(File file, Repository repos) throws HistoryException {
-        repository = (CVSRepository) repos;
+        cvsrepo = (CVSRepository) repos;
         try {
-            Executor executor = repository.getHistoryLogExecutor(file);
+            Executor executor = cvsrepo.getHistoryLogExecutor(file);
             int status = executor.exec(true, this);
 
             if (status != 0) {
@@ -183,6 +186,19 @@ History parse(File file, Repository repos) throws HistoryException {
                                        file.getAbsolutePath() + "\"", e);
         }
 
+        // In case there is a branch, the log entries can be returned in
+        // unsorted order (as a result of using '-r1.1:branch' for 'cvs log')
+        // so they need to be sorted according to revision.
+        if (cvsrepo.getBranch() != null && !cvsrepo.getBranch().isEmpty()) {
+            List<HistoryEntry> entries = history.getHistoryEntries();
+            Collections.sort(entries, new Comparator<HistoryEntry>() {
+                public int compare(HistoryEntry o1, HistoryEntry o2) {
+                    return o2.getRevision().compareTo(o1.getRevision());
+                }
+            });
+            history.setHistoryEntries(entries);
+        }
+
         return history;
     }
 

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

@@ -207,9 +207,8 @@ Executor getHistoryLogExecutor(final File file) throws IOException {
         cmd.add("log");
 
         if (getBranch() != null && !getBranch().isEmpty()) {
-            // Just generate THIS branch history, we don't care about the other
-            // branches which are not checked out.
-            cmd.add("-r" + branch);
+            // Generate history on this branch and follow up to the origin.
+            cmd.add("-r1.1:" + branch);
         } else {
             // Get revisions on this branch only (otherwise the revisions
             // list produced by the cvs log command would be unsorted).

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

@@ -142,12 +142,15 @@ public void testGetBranchNoBranch() throws Exception {
     }
 
     /**
-     * Get the CVS repository, create new branch and verify getBranch() returns it
-     * and check newly added commits annotate with branch revision numbers.
+     * Get the CVS repository, create new branch, change a file and verify that
+     * getBranch() returns the branch and check newly added commits annotate
+     * with branch revision numbers.
+     * Last, check that history entries of the file follow through before the
+     * branch was created.
      * @throws Exception
      */
     @Test
-    public void testGetBranchNewBranch() throws Exception {
+    public void testNewBranch() throws Exception {
         setUpTestRepository();
         File root = new File(repository.getSourceRoot(), "cvs_test/cvsrepo");
 
@@ -176,6 +179,12 @@ public void testGetBranchNewBranch() throws Exception {
         // Check that annotation for the changed line has branch revision.
         Annotation annotation = cvsrepo.annotate(mainC, null);
         assertEquals("1.2.2.1", annotation.getRevision(1));
+
+        History mainCHistory = cvsrepo.getHistory(mainC);
+        assertEquals(3, mainCHistory.getHistoryEntries().size());
+        assertEquals("1.2.2.1", mainCHistory.getHistoryEntries().get(0).getRevision());
+        assertEquals("1.2", mainCHistory.getHistoryEntries().get(1).getRevision());
+        assertEquals("1.1", mainCHistory.getHistoryEntries().get(2).getRevision());
     }
 
     /**