Submodules support

James Moger

2012-08-10 eb870fc034460c2bab69039b21049d332a002ca1

 src/com/gitblit/wicket/pages/CommitDiffPage.java

@@ -31,6 +31,7 @@
import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.models.SubmoduleModel;

import com.gitblit.utils.DiffUtils;

import com.gitblit.utils.DiffUtils.DiffOutputType;

import com.gitblit.utils.JGitUtils;

@@ -86,16 +87,45 @@
            setChangeTypeTooltip(changeType, entry.changeType);

            item.add(changeType);



            boolean hasSubmodule = false;

            String submodulePath = null;

            if (entry.isTree()) {

               // tree

               item.add(new LinkPanel("pathName", null, entry.path, TreePage.class,

                     WicketUtils

                           .newPathParameter(repositoryName, entry.commitId, entry.path)));

            } else if (entry.isSubmodule()) {

               // submodule

               String submoduleId = entry.objectId;						
               SubmoduleModel submodule = getSubmodule(entry.path);

               submodulePath = submodule.gitblitPath;

               hasSubmodule = submodule.hasSubmodule;

					
               item.add(new LinkPanel("pathName", "list", entry.path + " @ " +

                     getShortObjectId(submoduleId), TreePage.class,

                     WicketUtils

                           .newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule));

            } else {

               // blob

               item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class,

                     WicketUtils

                           .newPathParameter(repositoryName, entry.commitId, entry.path)));

            }



            // quick links

            if (entry.isSubmodule()) {

               // submodule					
               item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, WicketUtils

                     .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false));

               item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils

                     .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));

               item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils

                     .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false));

               item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils

                     .newPathParameter(submodulePath, entry.objectId, entry.path))

                     .setEnabled(hasSubmodule));

            } else {

               // tree or blob

            item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path)));

            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils

@@ -105,7 +135,7 @@
            item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path))

                  .setEnabled(!entry.changeType.equals(ChangeType.ADD)));



            }

            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

         }