Merge pull request #2077 from idodeclare/bugfix/badpath

Properly handle result of getRelativeToCanonical()

Author: tarzanek

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

@@ -855,10 +855,15 @@ protected Repository getRepository(File path) {
                         e);
                     return null;
                 }
-                String inRootPath = Paths.get(rootKey, rel).toString();
-                Repository r = repositories.get(inRootPath);
-                if (r != null) {
-                    return r;
+                Repository repo;
+                if (rel.equals(nextPath)) {
+                    repo = repositories.get(nextPath);
+                } else {
+                    String inRootPath = Paths.get(rootKey, rel).toString();
+                    repo = repositories.get(inRootPath);
+                }
+                if (repo != null) {
+                    return repo;
                 }
             }
 

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

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.history;
 
@@ -131,7 +131,9 @@ public void setDirectoryName(File dir) {
             // `directoryNameRelative' must start with a '/', as it is
             // elsewhere directly appended to env.getSourceRootPath() and
             // also stored as such.
-            if (!path.equals(originalPath)) path = File.separator + path;
+            if (!path.equals(originalPath)) {
+                path = File.separator + path;
+            }
         } catch (IOException e) {
             path = originalPath;
             LOGGER.log(Level.SEVERE, String.format(