Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/wicket/panels/HistoryPanel.java

@@ -38,8 +38,6 @@
import org.eclipse.jgit.revwalk.RevCommit;

import org.eclipse.jgit.treewalk.TreeWalk;

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

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.gitblit.Constants;

import com.gitblit.Keys;

@@ -63,8 +61,6 @@


   private static final long serialVersionUID = 1L;



   private final Logger log = LoggerFactory.getLogger(getClass());



   private boolean hasMore;



   public HistoryPanel(String wicketId, final String repositoryName, final String objectId,

@@ -78,20 +74,18 @@


      RevCommit commit = JGitUtils.getCommit(r, objectId);

      PathModel matchingPath = null;

      List<PathChangeModel> paths;

      Map<String, SubmoduleModel> submodules = new HashMap<String, SubmoduleModel>();



      if (commit == null) {

         // commit missing

         String msg = MessageFormat.format("Failed to find history of **{0}** *{1}*",

               path, objectId);

         log.error(msg + " " + repositoryName);

         paths = new ArrayList<PathChangeModel>();

         logger().error(msg + " " + repositoryName);

         add(new Label("commitHeader", MarkdownUtils.transformMarkdown(msg)).setEscapeModelStrings(false));

         add(new Label("breadcrumbs"));

      } else {

         // commit found

         paths = JGitUtils.getFilesInCommit(r, commit);

         List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit);

         add(new CommitHeaderPanel("commitHeader", repositoryName, commit));

         add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));

         for (SubmoduleModel model : JGitUtils.getSubmodules(r, commit.getTree())) {

@@ -115,14 +109,14 @@
               tw.setFilter(PathFilterGroup.createFromStrings(Collections.singleton(path)));

               while (tw.next()) {

                  if (tw.getPathString().equals(path)) {

                     matchingPath = new PathChangeModel(tw.getPathString(), tw.getPathString(), 0, tw

                     matchingPath = new PathChangeModel(tw.getPathString(), tw.getPathString(), null, 0, tw

                        .getRawMode(0), tw.getObjectId(0).getName(), commit.getId().getName(),

                        ChangeType.MODIFY);

                  }

               }

            } catch (Exception e) {

            } finally {

               tw.release();

               tw.close();

            }

         }

      }

@@ -166,7 +160,7 @@
         @Override

         public void populateItem(final Item<RevCommit> item) {

            final RevCommit entry = item.getModelObject();

            final Date date = JGitUtils.getCommitDate(entry);

            final Date date = JGitUtils.getAuthorDate(entry);



            item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils()));