Preliminary implementation of server-side forking (issue 137)

James Moger

2012-09-29 1e1b85270f93b3bca624c99b478f3a9a23be2395

 src/com/gitblit/utils/JGitUtils.java

@@ -745,17 +745,22 @@
            df.setDetectRenames(true);

            List<DiffEntry> diffs = df.scan(parent.getTree(), commit.getTree());

            for (DiffEntry diff : diffs) {

               String objectId = null;

               if (FileMode.GITLINK.equals(diff.getNewMode())) {

                  objectId = diff.getNewId().name();

               }



               if (diff.getChangeType().equals(ChangeType.DELETE)) {

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

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

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

                        .getChangeType()));

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

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

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

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

                        .getChangeType()));

               } else {

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

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

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

                        .getChangeType()));

               }

            }

@@ -1364,9 +1369,23 @@
    * @return all refs grouped by their referenced object id

    */

   public static Map<ObjectId, List<RefModel>> getAllRefs(Repository repository) {

      return getAllRefs(repository, true);

   }

	
   /**

    * Returns all refs grouped by their associated object id.

    * 
    * @param repository

    * @param includeRemoteRefs

    * @return all refs grouped by their referenced object id

    */

   public static Map<ObjectId, List<RefModel>> getAllRefs(Repository repository, boolean includeRemoteRefs) {

      List<RefModel> list = getRefs(repository, org.eclipse.jgit.lib.RefDatabase.ALL, true, -1);

      Map<ObjectId, List<RefModel>> refs = new HashMap<ObjectId, List<RefModel>>();

      for (RefModel ref : list) {

         if (!includeRemoteRefs && ref.getName().startsWith(Constants.R_REMOTES)) {

            continue;

         }

         ObjectId objectid = ref.getReferencedObjectId();

         if (!refs.containsKey(objectid)) {

            refs.put(objectid, new ArrayList<RefModel>());