Fix Eclipse complaints about illegal tag location.

James Moger

2011-04-18 ff369d23bd12f501b59726cbec77512e2f39fd13

 src/com/gitblit/utils/JGitUtils.java

@@ -20,6 +20,9 @@
import org.eclipse.jgit.diff.DiffFormatter;

import org.eclipse.jgit.diff.RawTextComparator;

import org.eclipse.jgit.errors.ConfigInvalidException;

import org.eclipse.jgit.errors.IncorrectObjectTypeException;

import org.eclipse.jgit.errors.MissingObjectException;

import org.eclipse.jgit.errors.StopWalkException;

import org.eclipse.jgit.lib.AnyObjectId;

import org.eclipse.jgit.lib.Constants;

import org.eclipse.jgit.lib.FileMode;

@@ -34,6 +37,7 @@
import org.eclipse.jgit.revwalk.RevObject;

import org.eclipse.jgit.revwalk.RevTree;

import org.eclipse.jgit.revwalk.RevWalk;

import org.eclipse.jgit.revwalk.filter.RevFilter;

import org.eclipse.jgit.treewalk.TreeWalk;

import org.eclipse.jgit.treewalk.filter.AndTreeFilter;

import org.eclipse.jgit.treewalk.filter.PathFilter;

@@ -288,20 +292,35 @@
   }



   public static String getCommitDiff(Repository r, RevCommit commit, boolean outputHtml) {

      return getCommitDiff(r, commit, null, outputHtml);

      return getCommitDiff(r, null, commit, null, outputHtml);

   }



   public static String getCommitDiff(Repository r, RevCommit commit, String path, boolean outputHtml) {

      return getCommitDiff(r, null, commit, path, outputHtml);

   }



   public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit, boolean outputHtml) {

      return getCommitDiff(r, baseCommit, commit, null, outputHtml);

   }



   public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit, String path, boolean outputHtml) {

      try {

         final RevWalk rw = new RevWalk(r);

         RevCommit parent = rw.parseCommit(commit.getParent(0).getId());

         RevTree parentTree = parent.getTree();

         RevTree baseTree;

         if (baseCommit == null) {

            final RevWalk rw = new RevWalk(r);

            RevCommit parent = rw.parseCommit(commit.getParent(0).getId());

            rw.dispose();

            baseTree = parent.getTree();

         } else {

            baseTree = baseCommit.getTree();

         }



         RevTree commitTree = commit.getTree();



         final TreeWalk walk = new TreeWalk(r);

         walk.reset();

         walk.setRecursive(true);

         walk.addTree(parentTree);

         walk.addTree(baseTree);

         walk.addTree(commitTree);

         walk.setFilter(TreeFilter.ANY_DIFF);



@@ -316,7 +335,7 @@
         df.setRepository(r);

         df.setDiffComparator(cmp);

         df.setDetectRenames(true);

         List<DiffEntry> diffs = df.scan(parentTree, commitTree);

         List<DiffEntry> diffs = df.scan(baseTree, commitTree);

         if (path != null && path.length() > 0) {

            for (DiffEntry diff : diffs) {

               if (diff.getNewPath().equalsIgnoreCase(path)) {

@@ -347,16 +366,25 @@
   }



   public static String getCommitPatch(Repository r, RevCommit commit, String path) {

      return getCommitPatch(r, null, commit, path);

   }



   public static String getCommitPatch(Repository r, RevCommit baseCommit, RevCommit commit, String path) {

      try {

         final RevWalk rw = new RevWalk(r);

         RevCommit parent = rw.parseCommit(commit.getParent(0).getId());

         RevTree parentTree = parent.getTree();

         RevTree baseTree;

         if (baseCommit == null) {

            final RevWalk rw = new RevWalk(r);

            RevCommit parent = rw.parseCommit(commit.getParent(0).getId());

            baseTree = parent.getTree();

         } else {

            baseTree = baseCommit.getTree();

         }

         RevTree commitTree = commit.getTree();



         final TreeWalk walk = new TreeWalk(r);

         walk.reset();

         walk.setRecursive(true);

         walk.addTree(parentTree);

         walk.addTree(baseTree);

         walk.addTree(commitTree);

         walk.setFilter(TreeFilter.ANY_DIFF);



@@ -366,7 +394,7 @@
         df.setRepository(r);

         df.setDiffComparator(cmp);

         df.setDetectRenames(true);

         List<DiffEntry> diffs = df.scan(parentTree, commitTree);

         List<DiffEntry> diffs = df.scan(baseTree, commitTree);

         if (path != null && path.length() > 0) {

            for (DiffEntry diff : diffs) {

               if (diff.getNewPath().equalsIgnoreCase(path)) {

@@ -439,7 +467,7 @@
   public static List<RevCommit> getRevLog(Repository r, String objectId, int offset, int maxCount) {

      return getRevLog(r, objectId, null, offset, maxCount);

   }

	


   public static List<RevCommit> getRevLog(Repository r, String objectId, String path, int offset, int maxCount) {

      List<RevCommit> list = new ArrayList<RevCommit>();

      try {

@@ -450,9 +478,7 @@
         ObjectId object = r.resolve(objectId);

         walk.markStart(walk.parseCommit(object));

         if (!StringUtils.isEmpty(path)) {

            TreeFilter filter = AndTreeFilter.create(PathFilterGroup

                  .createFromStrings(Collections.singleton(path)),

                  TreeFilter.ANY_DIFF);

            TreeFilter filter = AndTreeFilter.create(PathFilterGroup.createFromStrings(Collections.singleton(path)), TreeFilter.ANY_DIFF);

            walk.setTreeFilter(filter);

         }

         Iterable<RevCommit> revlog = walk;

@@ -482,6 +508,77 @@
      return list;

   }



   public static enum SearchType {

      AUTHOR, COMMITTER, COMMIT;



      public static SearchType forName(String name) {

         for (SearchType type : values()) {

            if (type.name().equalsIgnoreCase(name)) {

               return type;

            }

         }

         return null;

      }

   }



   public static List<RevCommit> searchRevlogs(Repository r, String objectId, String value, final SearchType type, int offset, int maxCount) {

      final String lcValue = value.toLowerCase();

      List<RevCommit> list = new ArrayList<RevCommit>();

      try {

         if (objectId == null || objectId.trim().length() == 0) {

            objectId = Constants.HEAD;

         }

         RevWalk walk = new RevWalk(r);

         walk.setRevFilter(new RevFilter() {



            @Override

            public RevFilter clone() {

               return this;

            }



            @Override

            public boolean include(RevWalk walker, RevCommit commit) throws StopWalkException, MissingObjectException, IncorrectObjectTypeException, IOException {

               switch (type) {

               case AUTHOR:

                  return (commit.getAuthorIdent().getName().toLowerCase().indexOf(lcValue) > -1) || (commit.getAuthorIdent().getEmailAddress().toLowerCase().indexOf(lcValue) > -1);

               case COMMITTER:

                  return (commit.getCommitterIdent().getName().toLowerCase().indexOf(lcValue) > -1)|| (commit.getCommitterIdent().getEmailAddress().toLowerCase().indexOf(lcValue) > -1);

               case COMMIT:

                  return commit.getFullMessage().toLowerCase().indexOf(lcValue) > -1;

               }

               return false;

            }



         });

         ObjectId object = r.resolve(objectId);

         walk.markStart(walk.parseCommit(object));

         Iterable<RevCommit> revlog = walk;

         if (offset > 0) {

            int count = 0;

            for (RevCommit rev : revlog) {

               count++;

               if (count > offset) {

                  list.add(rev);

                  if (maxCount > 0 && list.size() == maxCount) {

                     break;

                  }

               }

            }

         } else {

            for (RevCommit rev : revlog) {

               list.add(rev);

               if (maxCount > 0 && list.size() == maxCount) {

                  break;

               }

            }

         }

         walk.dispose();

      } catch (Throwable t) {

         LOGGER.error("Failed to determine last change", t);

      }

      return list;

   }



   public static List<RefModel> getTags(Repository r, int maxCount) {

      return getRefs(r, Constants.R_TAGS, maxCount);

   }