Improve transparency of permissions by indicating permission source

James Moger

2012-10-31 644bdd5a59a5ed5fbf93a0765f92608b0530c16a

 src/com/gitblit/LuceneExecutor.java

@@ -167,10 +167,21 @@
      String exts = storedSettings.getString(Keys.web.luceneIgnoreExtensions, luceneIgnoreExtensions);

      excludedExtensions = new TreeSet<String>(StringUtils.getStringsFromValue(exts));



      if (GitBlit.self().isCollectingGarbage()) {

         // busy collecting garbage, try again later

         return;

      }

		
      for (String repositoryName: GitBlit.self().getRepositoryList()) {

         RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);

         if (model.hasCommits && !ArrayUtils.isEmpty(model.indexedBranches)) {

            Repository repository = GitBlit.self().getRepository(model.name);

            if (repository == null) {

               if (GitBlit.self().isCollectingGarbage(model.name)) {

                  logger.info(MessageFormat.format("Skipping Lucene index of {0}, busy garbage collecting", repositoryName));

               }

               continue;

            }

            index(model, repository);            

            repository.close();

            System.gc();

@@ -286,7 +297,7 @@
         close(repositoryName);



         // delete the index folder

         File repositoryFolder = new File(repositoriesFolder, repositoryName);

         File repositoryFolder = FileKey.resolve(new File(repositoriesFolder, repositoryName), FS.DETECTED);

         File luceneIndex = new File(repositoryFolder, LUCENE_DIR);

         if (luceneIndex.exists()) {

            org.eclipse.jgit.util.FileUtils.delete(luceneIndex,

@@ -494,6 +505,7 @@
            

            Map<String, ObjectId> paths = new TreeMap<String, ObjectId>();

            while (treeWalk.next()) {

               // ensure path is not in a submodule

               if (treeWalk.getFileMode(0) != FileMode.GITLINK) {

                  paths.put(treeWalk.getPathString(), treeWalk.getObjectId(0));

               }

@@ -651,6 +663,9 @@
               Resolution.MINUTE);

         IndexWriter writer = getIndexWriter(repositoryName);

         for (PathChangeModel path : changedPaths) {

            if (path.isSubmodule()) {

               continue;

            }

            // delete the indexed blob

            deleteBlob(repositoryName, branch, path.name);



@@ -679,8 +694,10 @@
                  // read the blob content

                  String str = JGitUtils.getStringContent(repository, commit.getTree(),

                        path.path, encodings);

                  doc.add(new Field(FIELD_CONTENT, str, Store.YES, Index.ANALYZED));

                  writer.addDocument(doc);

                  if (str != null) {

                     doc.add(new Field(FIELD_CONTENT, str, Store.YES, Index.ANALYZED));

                     writer.addDocument(doc);

                  }

               }

            }

         }