use native paths

Author: Vladimir Kotal

opengrok-indexer/src/main/java/org/opengrok/indexer/history/GitRepository.java

@@ -595,6 +595,14 @@ History getHistory(File file, String sinceRevision) throws HistoryException {
         return result;
     }
 
+    private static String getNativePath(String path) {
+        if (!File.separator.equals("/")) {
+            return path.replace("/", File.separator);
+        }
+
+        return path;
+    }
+
     private void getFiles(org.eclipse.jgit.lib.Repository repository,
                           RevCommit oldCommit, RevCommit newCommit,
                           Set<String> files, List<String> renamedFiles)
@@ -610,10 +618,10 @@ private void getFiles(org.eclipse.jgit.lib.Repository repository,
 
             for (DiffEntry diff : diffs) {
                 if (diff.getChangeType() != DiffEntry.ChangeType.DELETE) {
-                    files.add(getDirectoryNameRelative() + "/" + diff.getNewPath());
+                    files.add(getDirectoryNameRelative() + File.separator + getNativePath(diff.getNewPath()));
                 }
                 if (diff.getChangeType() == DiffEntry.ChangeType.RENAME && isHandleRenamedFiles()) {
-                    renamedFiles.add(diff.getNewPath());
+                    renamedFiles.add(getNativePath(diff.getNewPath()));
                 }
             }
         }

opengrok-indexer/src/test/java/org/opengrok/indexer/history/GitRepositoryTest.java

@@ -547,35 +547,39 @@ public void testHistory(boolean renamedHandling) throws Exception {
                 new HistoryEntry("84599b3c", new Date(1485438707000L),
                         "Kryštof Tulinger <[email protected]>", null,
                         "    renaming directories\n\n", true,
-                        Set.of("/git/moved2/renamed2.c")),
+                        Set.of(File.separator + Paths.get("git", "moved2", "renamed2.c"))),
                 new HistoryEntry("67dfbe26", new Date(1485263397000L),
                         "Kryštof Tulinger <[email protected]>", null,
                         "    renaming renamed -> renamed2\n\n", true,
-                        Set.of("/git/moved/renamed2.c")),
+                        Set.of(File.separator + Paths.get("git", "moved", "renamed2.c"))),
                 new HistoryEntry("1086eaf5", new Date(1485263368000L),
                         "Kryštof Tulinger <[email protected]>", null,
                         "     adding some lines into renamed.c\n\n", true,
-                        Set.of("/git/moved/renamed.c")),
+                        Set.of(File.separator + Paths.get("git", "moved", "renamed.c"))),
                 new HistoryEntry("b6413947", new Date(1485263264000L),
                         "Kryštof Tulinger <[email protected]>", null,
                         "    moved renamed.c to new location\n\n", true,
-                        Set.of("/git/moved/renamed.c")),
+                        Set.of(File.separator + Paths.get("git", "moved", "renamed.c"))),
                 new HistoryEntry("ce4c98ec", new Date(1485263232000L),  // start in the sub-test below
                         "Kryštof Tulinger <[email protected]>", null,
                         "    adding simple file for renamed file testing\n\n", true,
-                        Set.of("/git/renamed.c")),
+                        Set.of(File.separator + Paths.get("git", "renamed.c"))),
                 new HistoryEntry("aa35c258", new Date(1218571965000L),
                         "Trond Norbye <[email protected]>", null,
                         "    Add lint make target and fix lint warnings\n\n", true,
-                        Set.of("/git/Makefile", "/git/main.c")),
+                        Set.of(File.separator + Paths.get("git", "Makefile"),
+                                File.separator + Paths.get("git", "main.c"))),
                 new HistoryEntry("84821564", new Date(1218571643000L),
                         "Trond Norbye <[email protected]>", null,
                         "    Add the result of a make on Solaris x86\n\n", true,
-                        Set.of("/git/main.o", "/git/testsprog")),
+                        Set.of(File.separator + Paths.get("git", "main.o"),
+                                File.separator + Paths.get("git", "testsprog"))),
                 new HistoryEntry("bb74b7e8", new Date(1218571573000L),
                         "Trond Norbye <[email protected]>", null,
                         "    Added a small test program\n\n", true,
-                        Set.of("/git/Makefile", "/git/header.h", "/git/main.c")));
+                        Set.of(File.separator + Paths.get("git", "Makefile"),
+                                File.separator + Paths.get("git", "header.h"),
+                                File.separator + Paths.get("git", "main.c"))));
 
         List<String> expectedRenamedFiles = List.of("moved/renamed2.c", "moved2/renamed2.c", "moved/renamed.c");