From 13417cf9c6eec555b51da49742e47939d2f5715b Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 19 Oct 2012 22:47:33 -0400 Subject: [PATCH] Exclude submodules from zip downloads (issue 151) --- src/com/gitblit/models/RepositoryModel.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 113 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java index 9a774fb..502f886 100644 --- a/src/com/gitblit/models/RepositoryModel.java +++ b/src/com/gitblit/models/RepositoryModel.java @@ -19,9 +19,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import com.gitblit.Constants.AccessRestrictionType; +import com.gitblit.Constants.AuthorizationControl; import com.gitblit.Constants.FederationStrategy; +import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.StringUtils; /** @@ -45,6 +50,8 @@ public boolean useTickets; public boolean useDocs; public AccessRestrictionType accessRestriction; + public AuthorizationControl authorizationControl; + public boolean allowAuthenticated; public boolean isFrozen; public boolean showReadme; public FederationStrategy federationStrategy; @@ -53,9 +60,23 @@ public boolean skipSizeCalculation; public boolean skipSummaryMetrics; public String frequency; + public boolean isBare; public String origin; + public String HEAD; + public List<String> availableRefs; + public List<String> indexedBranches; public String size; - + public List<String> preReceiveScripts; + public List<String> postReceiveScripts; + public List<String> mailingLists; + public Map<String, String> customFields; + public String projectPath; + private String displayName; + public boolean allowForks; + public Set<String> forks; + public String originRepository; + public boolean verifyCommitter; + public RepositoryModel() { this("", "", "", new Date(0)); } @@ -66,17 +87,106 @@ this.owner = owner; this.lastChange = lastchange; this.accessRestriction = AccessRestrictionType.NONE; + this.authorizationControl = AuthorizationControl.NAMED; this.federationSets = new ArrayList<String>(); - this.federationStrategy = FederationStrategy.FEDERATE_THIS; + this.federationStrategy = FederationStrategy.FEDERATE_THIS; + this.projectPath = StringUtils.getFirstPathElement(name); + } + + public List<String> getLocalBranches() { + if (ArrayUtils.isEmpty(availableRefs)) { + return new ArrayList<String>(); + } + List<String> localBranches = new ArrayList<String>(); + for (String ref : availableRefs) { + if (ref.startsWith("refs/heads")) { + localBranches.add(ref); + } + } + return localBranches; + } + + public void addFork(String repository) { + if (forks == null) { + forks = new TreeSet<String>(); + } + forks.add(repository); + } + + public void removeFork(String repository) { + if (forks == null) { + return; + } + forks.remove(repository); + } + + 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() { - return name; + if (displayName == null) { + displayName = StringUtils.stripDotGit(name); + } + return displayName; } @Override public int compareTo(RepositoryModel o) { return StringUtils.compareRepositoryNames(name, o.name); } + + public boolean isFork() { + return !StringUtils.isEmpty(originRepository); + } + + public boolean isOwner(String username) { + return owner != null && username != null && owner.equalsIgnoreCase(username); + } + + public boolean isPersonalRepository() { + return !StringUtils.isEmpty(projectPath) && projectPath.charAt(0) == '~'; + } + + public boolean isUsersPersonalRepository(String username) { + 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; + clone.name = cloneName; + clone.projectPath = StringUtils.getFirstPathElement(cloneName); + clone.isBare = true; + clone.description = description; + clone.accessRestriction = AccessRestrictionType.PUSH; + clone.authorizationControl = AuthorizationControl.NAMED; + clone.federationStrategy = federationStrategy; + clone.showReadme = showReadme; + clone.showRemoteBranches = false; + clone.allowForks = false; + clone.useDocs = useDocs; + clone.useTickets = useTickets; + clone.skipSizeCalculation = skipSizeCalculation; + clone.skipSummaryMetrics = skipSummaryMetrics; + return clone; + } } \ No newline at end of file -- Gitblit v1.9.1