From e94078b80f2ff1090e62e210baf687d241b32c3a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 03 Oct 2012 09:18:51 -0400
Subject: [PATCH] Display entire fork network. Link as appropriate for user permissions.
---
src/com/gitblit/wicket/pages/ForksPage.java | 199 ++++++++++++++++++---------------------
src/com/gitblit/GitBlit.java | 2
src/com/gitblit/wicket/pages/ForksPage.html | 19 ---
src/com/gitblit/models/RepositoryModel.java | 17 +++
src/com/gitblit/models/ForkModel.java | 13 +-
src/com/gitblit/models/UserModel.java | 7 +
6 files changed, 123 insertions(+), 134 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 4ada748..1ebc4c7 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1425,7 +1425,7 @@
private ForkModel getForkModel(String repository) {
RepositoryModel model = repositoryListCache.get(repository);
- ForkModel fork = new ForkModel(model.originRepository, model.name);
+ ForkModel fork = new ForkModel(model);
if (!ArrayUtils.isEmpty(model.forks)) {
for (String aFork : model.forks) {
ForkModel fm = getForkModel(aFork);
diff --git a/src/com/gitblit/models/ForkModel.java b/src/com/gitblit/models/ForkModel.java
index b394396..849986c 100644
--- a/src/com/gitblit/models/ForkModel.java
+++ b/src/com/gitblit/models/ForkModel.java
@@ -32,20 +32,17 @@
private static final long serialVersionUID = 1L;
- public final String originRepository;
-
- public final String repository;
+ public final RepositoryModel repository;
public final List<ForkModel> forks;
- public ForkModel(String origin, String repository) {
- this.originRepository = origin;
+ public ForkModel(RepositoryModel repository) {
this.repository = repository;
this.forks = new ArrayList<ForkModel>();
}
public boolean isRoot() {
- return StringUtils.isEmpty(originRepository);
+ return StringUtils.isEmpty(repository.originRepository);
}
public boolean isNode() {
@@ -57,7 +54,7 @@
}
public boolean isPersonalRepository() {
- return repository.charAt(0) == '~';
+ return repository.isPersonalRepository();
}
@Override
@@ -75,6 +72,6 @@
@Override
public String toString() {
- return repository;
+ return repository.toString();
}
}
diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index 3148b5b..a28536d 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -121,6 +121,19 @@
public void resetDisplayName() {
displayName = null;
}
+
+ @Override
+ public int hashCode() {
+ return name.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o instanceof RepositoryModel) {
+ return name.equals(((RepositoryModel) o).name);
+ }
+ return false;
+ }
@Override
public String toString() {
@@ -143,6 +156,10 @@
return !StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase("~" + username);
}
+ public boolean allowAnonymousView() {
+ return !accessRestriction.atLeast(AccessRestrictionType.VIEW);
+ }
+
public RepositoryModel cloneAs(String cloneName) {
RepositoryModel clone = new RepositoryModel();
clone.originRepository = name;
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 25787a1..7c32a55 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -36,6 +36,8 @@
private static final long serialVersionUID = 1L;
+ public static final UserModel ANONYMOUS = new UserModel("anonymous", false);
+
// field names are reflectively mapped in EditUser page
public String username;
public String password;
@@ -56,6 +58,11 @@
this.isAuthenticated = true;
}
+ private UserModel(String username, boolean authenticated) {
+ this.username = username;
+ this.isAuthenticated = authenticated;
+ }
+
/**
* This method does not take into consideration Ownership where the
* administrator has not explicitly granted access to the owner.
diff --git a/src/com/gitblit/wicket/pages/ForksPage.html b/src/com/gitblit/wicket/pages/ForksPage.html
index f59f9ca..c18d2a4 100644
--- a/src/com/gitblit/wicket/pages/ForksPage.html
+++ b/src/com/gitblit/wicket/pages/ForksPage.html
@@ -7,26 +7,13 @@
<body>
<wicket:extend>
- <div class="forkSource">
- <div>
- <b><span class="repositorySwatch" wicket:id="forkSourceSwatch"></span></b>
- <span wicket:id="forkSourceAvatar" style="vertical-align: baseline;"></span>
- <span wicket:id="forkSourceProject">[a project]</span> / <span wicket:id="forkSource">[a fork]</span>
- </div>
- <div style="padding-left:32px;" wicket:id="forkSourceOrigin">[origin repository]</div>
- </div>
-
<div wicket:id="fork">
- <div class="forkEntry" style="margin-left:32px;">
- <span wicket:id="anAvatar" style="vertical-align: baseline;"></span>
+ <div>
+ <span wicket:id="anAvatar" style="vertical-align: baseline;font-weight:bold;"></span>
<span wicket:id="aProject">[a project]</span> / <span wicket:id="aFork">[a fork]</span>
- <span wicket:id="anIcon" class="forks"></span>
+ <span style="padding-left:10px;" wicket:id="lastChange"></span>
</div>
</div>
-
- <wicket:fragment wicket:id="originFragment">
- <p class="originRepository"><wicket:message key="gb.forkedFrom">[forked from]</wicket:message> <span wicket:id="originRepository">[origin repository]</span></p>
- </wicket:fragment>
</wicket:extend>
</body>
diff --git a/src/com/gitblit/wicket/pages/ForksPage.java b/src/com/gitblit/wicket/pages/ForksPage.java
index 44f0ed1..2e67e2b 100644
--- a/src/com/gitblit/wicket/pages/ForksPage.java
+++ b/src/com/gitblit/wicket/pages/ForksPage.java
@@ -15,14 +15,13 @@
*/
package com.gitblit.wicket.pages;
-import java.text.MessageFormat;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
@@ -30,9 +29,9 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.models.ForkModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
-import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
@@ -44,132 +43,114 @@
public ForksPage(PageParameters params) {
super(params);
- UserModel user = GitBlitWebSession.get().getUser();
- RepositoryModel model = getRepositoryModel();
- RepositoryModel origin = model;
- List<String> list;
- if (ArrayUtils.isEmpty(model.forks)) {
- if (!StringUtils.isEmpty(model.originRepository)) {
- // try origin repository
- origin = GitBlit.self().getRepositoryModel(model.originRepository);
- }
- if (origin == null || origin.forks == null) {
- list = new ArrayList<String>();
- } else {
- list = new ArrayList<String>(origin.forks);
- }
- } else {
- // this repository has forks
- list = new ArrayList<String>(model.forks);
- }
+ final RepositoryModel pageRepository = getRepositoryModel();
- if (origin.isPersonalRepository()) {
- // personal repository
- UserModel originUser = GitBlit.self().getUserModel(origin.projectPath.substring(1));
- PersonIdent ident = new PersonIdent(originUser.getDisplayName(), originUser.emailAddress);
- add(new GravatarImage("forkSourceAvatar", ident, 20));
- add(new Label("forkSourceSwatch").setVisible(false));
- add(new LinkPanel("forkSourceProject", null, originUser.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(originUser.username)));
- } else {
- // standard repository
- add(new GravatarImage("forkSourceAvatar", new PersonIdent("", ""), 20).setVisible(false));
- Component swatch;
- if (origin.isBare){
- swatch = new Label("forkSourceSwatch", " ").setEscapeModelStrings(false);
- } else {
- swatch = new Label("forkSourceSwatch", "!");
- WicketUtils.setHtmlTooltip(swatch, getString("gb.workingCopyWarning"));
- }
- WicketUtils.setCssBackground(swatch, origin.toString());
- add(swatch);
- final boolean showSwatch = GitBlit.getBoolean(Keys.web.repositoryListSwatches, true);
- swatch.setVisible(showSwatch);
-
- String projectName = origin.projectPath;
- if (StringUtils.isEmpty(projectName)) {
- projectName = GitBlit.getString(Keys.web.repositoryRootGroupName, "main");
- }
- add(new LinkPanel("forkSourceProject", null, projectName, ProjectPage.class, WicketUtils.newProjectParameter(origin.projectPath)));
- }
+ ForkModel root = GitBlit.self().getForkNetwork(pageRepository.name);
+ List<FlatFork> network = flatten(root);
- String source = StringUtils.getLastPathElement(origin.name);
- if (user != null && user.canViewRepository(origin)) {
- // user can view the origin
- add(new LinkPanel("forkSource", null, StringUtils.stripDotGit(source), SummaryPage.class, WicketUtils.newRepositoryParameter(origin.name)));
- } else {
- // user can not view the origin
- add(new Label("forkSource", StringUtils.stripDotGit(source)));
- }
-
- // superOrigin?
- if (StringUtils.isEmpty(origin.originRepository)) {
- // origin is root
- add(new Label("forkSourceOrigin").setVisible(false));
- } else {
- // origin has an origin
- RepositoryModel superOrigin = GitBlit.self().getRepositoryModel(origin.originRepository);
- if (!user.canViewRepository(superOrigin)) {
- // show superOrigin repository without link
- Fragment forkFrag = new Fragment("forkSourceOrigin", "originFragment", this);
- forkFrag.add(new Label("originRepository", StringUtils.stripDotGit(superOrigin.name)));
- add(forkFrag);
- } else {
- // link to superOrigin repository
- Fragment forkFrag = new Fragment("forkSourceOrigin", "originFragment", this);
- forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(superOrigin.name),
- SummaryPage.class, WicketUtils.newRepositoryParameter(superOrigin.name)));
- add(forkFrag);
- }
- }
-
- // only display user-accessible forks
- List<RepositoryModel> forks = new ArrayList<RepositoryModel>();
- for (String aFork : list) {
- RepositoryModel fork = GitBlit.self().getRepositoryModel(user, aFork);
- if (fork != null) {
- forks.add(fork);
- }
- }
-
- ListDataProvider<RepositoryModel> forksDp = new ListDataProvider<RepositoryModel>(forks);
- DataView<RepositoryModel> forksList = new DataView<RepositoryModel>("fork", forksDp) {
+ ListDataProvider<FlatFork> forksDp = new ListDataProvider<FlatFork>(network);
+ DataView<FlatFork> forksList = new DataView<FlatFork>("fork", forksDp) {
private static final long serialVersionUID = 1L;
- public void populateItem(final Item<RepositoryModel> item) {
- RepositoryModel fork = item.getModelObject();
+ public void populateItem(final Item<FlatFork> item) {
+ FlatFork fork = item.getModelObject();
+ RepositoryModel repository = fork.repository;
- if (fork.isPersonalRepository()) {
- UserModel user = GitBlit.self().getUserModel(fork.projectPath.substring(1));
+ if (repository.isPersonalRepository()) {
+ UserModel user = GitBlit.self().getUserModel(repository.projectPath.substring(1));
PersonIdent ident = new PersonIdent(user.getDisplayName(), user.emailAddress);
item.add(new GravatarImage("anAvatar", ident, 20));
- item.add(new LinkPanel("aProject", null, user.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(user.username)));
+ if (pageRepository.equals(repository)) {
+ // do not link to self
+ item.add(new Label("aProject", user.getDisplayName()));
+ } else {
+ item.add(new LinkPanel("aProject", null, user.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(user.username)));
+ }
} else {
- PersonIdent ident = new PersonIdent(fork.name, fork.name);
- item.add(new GravatarImage("anAvatar", ident, 20));
- item.add(new LinkPanel("aProject", null, fork.projectPath, ProjectPage.class, WicketUtils.newProjectParameter(fork.projectPath)));
+ Component swatch;
+ if (repository.isBare){
+ swatch = new Label("anAvatar", " ").setEscapeModelStrings(false);
+ } else {
+ swatch = new Label("anAvatar", "!");
+ WicketUtils.setHtmlTooltip(swatch, getString("gb.workingCopyWarning"));
+ }
+ WicketUtils.setCssClass(swatch, "repositorySwatch");
+ WicketUtils.setCssBackground(swatch, repository.toString());
+ item.add(swatch);
+ String projectName = repository.projectPath;
+ if (StringUtils.isEmpty(projectName)) {
+ projectName = GitBlit.getString(Keys.web.repositoryRootGroupName, "main");
+ }
+ if (pageRepository.equals(repository)) {
+ // do not link to self
+ item.add(new Label("aProject", projectName));
+ } else {
+ item.add(new LinkPanel("aProject", null, projectName, ProjectPage.class, WicketUtils.newProjectParameter(projectName)));
+ }
}
- String repo = StringUtils.getLastPathElement(fork.name);
- item.add(new LinkPanel("aFork", null, StringUtils.stripDotGit(repo), SummaryPage.class, WicketUtils.newRepositoryParameter(fork.name)));
-
- if (ArrayUtils.isEmpty(fork.forks)) {
- // repository is a leaf
- Component icon = new Label("anIcon", "<i class=\"icon-leaf\" ></i>").setEscapeModelStrings(false);
- WicketUtils.setHtmlTooltip(icon, MessageFormat.format(getString("gb.noForks"), fork.name));
- item.add(icon);
+ String repo = StringUtils.getLastPathElement(repository.name);
+ UserModel user = GitBlitWebSession.get().getUser();
+ if (user == null) {
+ user = UserModel.ANONYMOUS;
+ }
+ if (user.canViewRepository(repository)) {
+ if (pageRepository.equals(repository)) {
+ // do not link to self
+ item.add(new Label("aFork", StringUtils.stripDotGit(repo)));
+ } else {
+ item.add(new LinkPanel("aFork", null, StringUtils.stripDotGit(repo), SummaryPage.class, WicketUtils.newRepositoryParameter(repository.name)));
+ }
+ item.add(WicketUtils.createDateLabel("lastChange", repository.lastChange, getTimeZone(), getTimeUtils()));
} else {
- // show forks link
- item.add(new LinkPanel("anIcon", null, "(" + getString("gb.forks") + ")", ForksPage.class, WicketUtils.newRepositoryParameter(fork.name)));
+ item.add(new Label("aFork", repo));
+ item.add(new Label("lastChange").setVisible(false));
+ }
+
+ WicketUtils.setCssStyle(item, "margin-left:" + (32*fork.level) + "px;");
+ if (fork.level == 0) {
+ WicketUtils.setCssClass(item, "forkSource");
+ } else {
+ WicketUtils.setCssClass(item, "forkEntry");
}
}
};
add(forksList);
-
}
@Override
protected String getPageName() {
return getString("gb.forks");
}
+
+ protected List<FlatFork> flatten(ForkModel root) {
+ List<FlatFork> list = new ArrayList<FlatFork>();
+ list.addAll(flatten(root, 0));
+ return list;
+ }
+
+ protected List<FlatFork> flatten(ForkModel node, int level) {
+ List<FlatFork> list = new ArrayList<FlatFork>();
+ list.add(new FlatFork(node.repository, level));
+ if (!node.isLeaf()) {
+ for (ForkModel fork : node.forks) {
+ list.addAll(flatten(fork, level + 1));
+ }
+ }
+ return list;
+ }
+
+ private class FlatFork implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public final RepositoryModel repository;
+ public final int level;
+
+ public FlatFork(RepositoryModel repository, int level) {
+ this.repository = repository;
+ this.level = level;
+ }
+ }
}
--
Gitblit v1.9.1