From 58be4a33a1ca70baae779d80eff5d79ab7c523a3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Sep 2013 10:10:36 -0400
Subject: [PATCH] Change diffstat character to improve look and layout
---
src/main/java/com/gitblit/models/RepositoryModel.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/models/RepositoryModel.java b/src/main/java/com/gitblit/models/RepositoryModel.java
index 1f2ee2d..f0354b9 100644
--- a/src/main/java/com/gitblit/models/RepositoryModel.java
+++ b/src/main/java/com/gitblit/models/RepositoryModel.java
@@ -26,8 +26,10 @@
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.AuthorizationControl;
+import com.gitblit.Constants.CommitMessageRenderer;
import com.gitblit.Constants.FederationStrategy;
import com.gitblit.utils.ArrayUtils;
+import com.gitblit.utils.ModelUtils;
import com.gitblit.utils.StringUtils;
/**
@@ -46,11 +48,13 @@
public String description;
public List<String> owners;
public Date lastChange;
+ public String lastChangeAuthor;
public boolean hasCommits;
public boolean showRemoteBranches;
public boolean useTickets;
public boolean useDocs;
- public boolean useIncrementalRevisionNumbers;
+ public boolean useIncrementalPushTags;
+ public String incrementalPushTagPrefix;
public AccessRestrictionType accessRestriction;
public AuthorizationControl authorizationControl;
public boolean allowAuthenticated;
@@ -80,7 +84,9 @@
public boolean verifyCommitter;
public String gcThreshold;
public int gcPeriod;
- public int maxActivityCommits;
+ public int maxActivityCommits;
+ public List<String> metricAuthorExclusions;
+ public CommitMessageRenderer commitMessageRenderer;
public transient boolean isCollectingGarbage;
public Date lastGC;
@@ -100,6 +106,7 @@
this.federationStrategy = FederationStrategy.FEDERATE_THIS;
this.projectPath = StringUtils.getFirstPathElement(name);
this.owners = new ArrayList<String>();
+ this.isBare = true;
addOwner(owner);
}
@@ -173,15 +180,19 @@
}
public boolean isPersonalRepository() {
- return !StringUtils.isEmpty(projectPath) && projectPath.charAt(0) == '~';
+ return !StringUtils.isEmpty(projectPath) && ModelUtils.isPersonalRepository(projectPath);
}
public boolean isUsersPersonalRepository(String username) {
- return !StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase("~" + username);
+ return !StringUtils.isEmpty(projectPath) && ModelUtils.isUsersPersonalRepository(username, projectPath);
}
public boolean allowAnonymousView() {
return !accessRestriction.atLeast(AccessRestrictionType.VIEW);
+ }
+
+ public boolean isShowActivity() {
+ return maxActivityCommits > -1;
}
public boolean isSparkleshared() {
@@ -202,7 +213,6 @@
clone.showRemoteBranches = false;
clone.allowForks = false;
clone.useDocs = useDocs;
- clone.useIncrementalRevisionNumbers = useIncrementalRevisionNumbers;
clone.useTickets = useTickets;
clone.skipSizeCalculation = skipSizeCalculation;
clone.skipSummaryMetrics = skipSummaryMetrics;
--
Gitblit v1.9.1