Merge pull request #820 from vladak/store_incr_fix

create file which stores the latest cached revision also when renamed fi...

Author: Vladimir Kotal

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

@@ -287,6 +287,13 @@ private void storeFile(History histNew, File file) throws HistoryException {
         }
     }
 
+    private void finishStore(Repository repository, String latestRev) {
+        storeLatestCachedRevision(repository, latestRev);
+        OpenGrokLogger.getLogger().log(Level.FINE,
+            "Done storing history for repo {0}",
+            new Object[] {repository.getDirectoryName()});
+    }
+
     /**
      * Store history for the whole repository in directory hierarchy resembling
      * the original repository structure. History of individual files will be
@@ -378,6 +385,7 @@ public void store(History history, Repository repository)
         }
 
         if (!RuntimeEnvironment.isRenamedFilesEnabled()) {
+            finishStore(repository, latestRev);
             return;
         }
 
@@ -437,10 +445,7 @@ public void run() {
         } catch (InterruptedException ex) {
             OpenGrokLogger.getLogger().log(Level.SEVERE, "latch exception" + ex);
         }
-        storeLatestCachedRevision(repository, latestRev);
-        OpenGrokLogger.getLogger().log(Level.FINE,
-            "Done storing history for repo {0}",
-            new Object[] {repository.getDirectoryName()});
+        finishStore(repository, latestRev);
     }
 
     @Override

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

@@ -50,9 +50,6 @@ public class FileHistoryCacheTest extends TestCase {
 
         cache = new FileHistoryCache();
         cache.initialize();
-
-        // The tests expect support for renamed files.
-        System.setProperty("org.opensolaris.opengrok.history.RenamedHandlingEnabled", "1");
     }
 
     /**
@@ -119,11 +116,37 @@ private void assertSameEntry(HistoryEntry expected, HistoryEntry actual, boolean
         }
     }
 
+    /**
+     * Basic tests for the {@code store()} method on cache with disabled
+     * handling of renamed files.
+     */
+    public void testStoreAndGetNotRenamed() throws Exception {
+        File reposRoot = new File(repositories.getSourceRoot(), "mercurial");
+        Repository repo = RepositoryFactory.getRepository(reposRoot);
+        History historyToStore = repo.getHistory(reposRoot);
+
+        cache.store(historyToStore, repo);
+
+        // This makes sure that the file which contains the latest revision
+        // has indeed been created.
+        assertEquals("9:8b340409b3a8", cache.getLatestCachedRevision(repo));
+
+        // test reindex
+        History historyNull = new History();
+        cache.store(historyNull, repo);
+
+        assertEquals("9:8b340409b3a8", cache.getLatestCachedRevision(repo));
+    }
+
     /**
      * Basic tests for the {@code store()} and {@code get()} methods.
      */
     public void testStoreAndGet() throws Exception {
         File reposRoot = new File(repositories.getSourceRoot(), "mercurial");
+
+        // The test expects support for renamed files.
+        System.setProperty("org.opensolaris.opengrok.history.RenamedHandlingEnabled", "1");
+
         Repository repo = RepositoryFactory.getRepository(reposRoot);
         History historyToStore = repo.getHistory(reposRoot);
 
@@ -234,6 +257,10 @@ public void testStoreAndGet() throws Exception {
     public void testRenamedFile() throws Exception {
         File reposRoot = new File(repositories.getSourceRoot(), "mercurial");
         Repository repo = RepositoryFactory.getRepository(reposRoot);
+
+        // The test expects support for renamed files.
+        System.setProperty("org.opensolaris.opengrok.history.RenamedHandlingEnabled", "1");
+
         History historyToStore = repo.getHistory(reposRoot);
 
         cache.store(historyToStore, repo);