Correct update of HEAD symbolic reference when target is a tag.

Philip L. McMahon

2012-01-27 30f9d25d77ccb5cd978d4cf8fa389ec819e90e95

 src/com/gitblit/wicket/panels/RepositoriesPanel.java

@@ -25,6 +25,7 @@
import java.util.List;

import java.util.Map;



import org.apache.wicket.Component;

import org.apache.wicket.PageParameters;

import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder;

import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;

@@ -47,12 +48,13 @@
import com.gitblit.SyndicationServlet;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ByteFormat;

import com.gitblit.utils.StringUtils;

import com.gitblit.utils.TimeUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.BasePage;

import com.gitblit.wicket.pages.EditRepositoryPage;

import com.gitblit.wicket.pages.EmptyRepositoryPage;

import com.gitblit.wicket.pages.SummaryPage;



public class RepositoriesPanel extends BasePanel {

@@ -60,11 +62,15 @@
   private static final long serialVersionUID = 1L;



   public RepositoriesPanel(String wicketId, final boolean showAdmin,

         List<RepositoryModel> models, boolean enableLinks,

         final Map<AccessRestrictionType, String> accessRestrictionTranslations) {

      super(wicketId);



      final boolean linksActive = enableLinks;

      final boolean showSize = GitBlit.getBoolean(Keys.web.showRepositorySizes, true);



      final UserModel user = GitBlitWebSession.get().getUser();

      List<RepositoryModel> models = GitBlit.self().getRepositoryModels(user);



      final IDataProvider<RepositoryModel> dp;



      Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);

@@ -100,6 +106,7 @@
         for (String root : roots) {

            List<RepositoryModel> subModels = groups.get(root);

            groupedModels.add(new GroupRepositoryModel(root, subModels.size()));

            Collections.sort(subModels);

            groupedModels.addAll(subModels);

         }

         dp = new RepositoriesProvider(groupedModels);

@@ -107,11 +114,13 @@
         dp = new SortableRepositoriesProvider(models);

      }



      final boolean showSize = GitBlit.getBoolean(Keys.web.showRepositorySizes, true);

      final ByteFormat byteFormat = new ByteFormat();

      final String baseUrl = WicketUtils.getGitblitURL(getRequest());

      final boolean showSwatch = GitBlit.getBoolean(Keys.web.repositoryListSwatches, true);



      DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("row", dp) {

         private static final long serialVersionUID = 1L;

         int counter;

         String currGroupName;



         @Override

         protected void onBeforeRender() {

@@ -122,31 +131,54 @@
         public void populateItem(final Item<RepositoryModel> item) {

            final RepositoryModel entry = item.getModelObject();

            if (entry instanceof GroupRepositoryModel) {

               currGroupName = entry.name;

               Fragment row = new Fragment("rowContent", "groupRepositoryRow", this);

               item.add(row);

               row.add(new Label("groupName", entry.toString()));

               WicketUtils.setCssClass(item, "group");

               // reset counter so that first row is light background

               counter = 0;

               return;

            }

            Fragment row = new Fragment("rowContent", "repositoryRow", this);

            item.add(row);



            // try to strip group name for less cluttered list

            String repoName = entry.toString();

            if (!StringUtils.isEmpty(currGroupName) && (repoName.indexOf('/') > -1)) {

               repoName = repoName.substring(currGroupName.length() + 1);

            }

				
            // repository swatch

            Component swatch = new Label("repositorySwatch", "&nbsp;").setEscapeModelStrings(false);

            WicketUtils.setCssBackground(swatch, entry.toString());

            row.add(swatch);

            swatch.setVisible(showSwatch);



            if (linksActive) {

               Class<? extends BasePage> linkPage;

               if (entry.hasCommits) {

                  // repository has content

                  linkPage = SummaryPage.class;

               } else {

                  // new/empty repository OR proposed repository

                  linkPage = EmptyRepositoryPage.class;

               }



               PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);

               row.add(new LinkPanel("repositoryName", "list", repoName, linkPage, pp));

               row.add(new LinkPanel("repositoryDescription", "list", entry.description,

                     linkPage, pp));

            } else {

               // no links like on a federation page

               row.add(new Label("repositoryName", repoName));

               row.add(new Label("repositoryDescription", entry.description));

            }

            if (entry.hasCommits) {

               // Existing repository

               PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);

               row.add(new LinkPanel("repositoryName", "list", entry.name, SummaryPage.class,

                     pp));

               row.add(new LinkPanel("repositoryDescription", "list", entry.description,

                     SummaryPage.class, pp));

               if (showSize) {

                  row.add(new Label("repositorySize", byteFormat.format(GitBlit.self()

                        .calculateSize(entry))));

               } else {

                  row.add(new Label("repositorySize").setVisible(false));

               }

               row.add(new Label("repositorySize", entry.size).setVisible(showSize));

            } else {

               // New repository

               row.add(new Label("repositoryName", entry.name));

               row.add(new Label("repositoryDescription", entry.description));

               row.add(new Label("repositorySize", "<span class='empty'>(empty)</span>")

                     .setEscapeModelStrings(false));

            }

@@ -170,6 +202,13 @@
                     getString("gb.isFrozen")));

            } else {

               row.add(WicketUtils.newClearPixel("frozenIcon").setVisible(false));

            }



            if (entry.isFederated) {

               row.add(WicketUtils.newImage("federatedIcon", "federated_16x16.png",

                     getString("gb.isFederated")));

            } else {

               row.add(WicketUtils.newClearPixel("federatedIcon").setVisible(false));

            }

            switch (entry.accessRestriction) {

            case NONE:

@@ -243,8 +282,8 @@
            } else {

               row.add(new Label("repositoryLinks"));

            }

            row.add(new ExternalLink("syndication", SyndicationServlet.asLink(getRequest()

                  .getRelativePathPrefixToContextRoot(), entry.name, null, 0)));

            row.add(new ExternalLink("syndication", SyndicationServlet.asLink(baseUrl,

                  entry.name, null, 0)).setVisible(linksActive));

            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

         }