Properly handle renames on incremental indexing

James Moger

2012-03-20 856091d000befd51967f20e1a7e59ccc59663f99

Properly handle renames on incremental indexing

 src/com/gitblit/LuceneExecutor.java

@@ -622,7 +622,7 @@
            IndexWriter writer = getIndexWriter(repositoryName);

            for (PathChangeModel path : changedPaths) {

                // delete the indexed blob

                deleteBlob(repositoryName, branch, path.path);

                deleteBlob(repositoryName, branch, path.name);



                // re-index the blob

                if (!ChangeType.DELETE.equals(path.changeType)) {


 src/com/gitblit/utils/JGitUtils.java

@@ -721,6 +721,10 @@
                        list.add(new PathChangeModel(diff.getOldPath(), diff.getOldPath(), 0, diff

                                .getNewMode().getBits(), commit.getId().getName(), diff

                                .getChangeType()));

                    } else if (diff.getChangeType().equals(ChangeType.RENAME)) {

                        list.add(new PathChangeModel(diff.getOldPath(), diff.getNewPath(), 0, diff

                                .getNewMode().getBits(), commit.getId().getName(), diff

                                .getChangeType()));

                    } else {

                        list.add(new PathChangeModel(diff.getNewPath(), diff.getNewPath(), 0, diff

                                .getNewMode().getBits(), commit.getId().getName(), diff