added attribute useIncrementalRevisionNumbers to repository model

6 files changed, 15 insertions, 0 deletions

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 4cfd61e4..3ac8d170 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1668,6 +1668,7 @@ public class GitBlit implements ServletContextListener {
 			model.addOwners(ArrayUtils.fromString(getConfig(config, "owner", "")));

 			model.useTickets = getConfig(config, "useTickets", false);

 			model.useDocs = getConfig(config, "useDocs", false);

+			model.useIncrementalRevisionNumbers = getConfig(config, "useIncrementalRevisionNumbers", false);

 			model.allowForks = getConfig(config, "allowForks", true);

 			model.accessRestriction = AccessRestrictionType.fromName(getConfig(config,

 					"accessRestriction", settings.getString(Keys.git.defaultAccessRestriction, null)));

@@ -2186,6 +2187,7 @@ public class GitBlit implements ServletContextListener {
 		config.setString(Constants.CONFIG_GITBLIT, null, "owner", ArrayUtils.toString(repository.owners));

 		config.setBoolean(Constants.CONFIG_GITBLIT, null, "useTickets", repository.useTickets);

 		config.setBoolean(Constants.CONFIG_GITBLIT, null, "useDocs", repository.useDocs);

+		config.setBoolean(Constants.CONFIG_GITBLIT, null, "useIncrementalRevisionNumbers", repository.useIncrementalRevisionNumbers);

 		config.setBoolean(Constants.CONFIG_GITBLIT, null, "allowForks", repository.allowForks);

 		config.setString(Constants.CONFIG_GITBLIT, null, "accessRestriction", repository.accessRestriction.name());

 		config.setString(Constants.CONFIG_GITBLIT, null, "authorizationControl", repository.authorizationControl.name());

diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index 8851de43..25f42f4a 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -92,6 +92,8 @@ public class EditRepositoryDialog extends JDialog {
 

 	private JCheckBox useDocs;

 

+	private JCheckBox useIncrementalRevisionNumbers;

+	

 	private JCheckBox showRemoteBranches;

 

 	private JCheckBox showReadme;

@@ -212,6 +214,8 @@ public class EditRepositoryDialog extends JDialog {
 				anRepository.useTickets);

 		useDocs = new JCheckBox(Translation.get("gb.useDocsDescription"),

 				anRepository.useDocs);

+		useIncrementalRevisionNumbers = new JCheckBox(Translation.get("gb.useIncrementalRevisionNumbersDescription"),

+				anRepository.useIncrementalRevisionNumbers);

 		showRemoteBranches = new JCheckBox(

 				Translation.get("gb.showRemoteBranchesDescription"),

 				anRepository.showRemoteBranches);

@@ -309,6 +313,8 @@ public class EditRepositoryDialog extends JDialog {
 				useTickets));

 		fieldsPanel

 				.add(newFieldPanel(Translation.get("gb.enableDocs"), useDocs));

+		fieldsPanel

+		.add(newFieldPanel(Translation.get("gb.enableIncrementalRevisionNumbers"), useIncrementalRevisionNumbers));

 		fieldsPanel.add(newFieldPanel(Translation.get("gb.showRemoteBranches"),

 				showRemoteBranches));

 		fieldsPanel.add(newFieldPanel(Translation.get("gb.showReadme"),

@@ -563,6 +569,7 @@ public class EditRepositoryDialog extends JDialog {
 		repository.gcThreshold = gcThreshold.getText();

 		repository.useTickets = useTickets.isSelected();

 		repository.useDocs = useDocs.isSelected();

+		repository.useIncrementalRevisionNumbers = useIncrementalRevisionNumbers.isSelected();

 		repository.showRemoteBranches = showRemoteBranches.isSelected();

 		repository.showReadme = showReadme.isSelected();

 		repository.skipSizeCalculation = skipSizeCalculation.isSelected();

diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index a2dab3c5..1f2ee2df 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -50,6 +50,7 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
 	public boolean showRemoteBranches;

 	public boolean useTickets;

 	public boolean useDocs;

+	public boolean useIncrementalRevisionNumbers;

 	public AccessRestrictionType accessRestriction;

 	public AuthorizationControl authorizationControl;

 	public boolean allowAuthenticated;

@@ -201,6 +202,7 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
 		clone.showRemoteBranches = false;

 		clone.allowForks = false;

 		clone.useDocs = useDocs;

+		clone.useIncrementalRevisionNumbers = useIncrementalRevisionNumbers;

 		clone.useTickets = useTickets;

 		clone.skipSizeCalculation = skipSizeCalculation;

 		clone.skipSummaryMetrics = skipSummaryMetrics;

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index a993f9f1..b6b59ac5 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -73,6 +73,7 @@ gb.accessRestriction = access restriction
 gb.name = name

 gb.enableTickets = enable tickets

 gb.enableDocs = enable docs

+gb.enableIncrementalRevisionNumbers = enable incremental revision numbers

 gb.save = save

 gb.showRemoteBranches = show remote branches

 gb.editUsers = edit users

@@ -85,6 +86,7 @@ gb.cloneRestricted = authenticated clone & push
 gb.viewRestricted = authenticated view, clone, & push

 gb.useTicketsDescription = readonly, distributed Ticgit issues

 gb.useDocsDescription = enumerates Markdown documentation in repository

+gb.useIncrementalRevisionNumbersDescription = automatic tagging of each push with an incremental revision number

 gb.showRemoteBranchesDescription = show remote branches

 gb.canAdminDescription = can administer Gitblit server

 gb.permittedUsers = permitted users

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/com/gitblit/wicket/pages/EditRepositoryPage.html
index 7fc0de23..37ea0dd2 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -35,6 +35,7 @@
 				<tr><th colspan="2"><hr/></th></tr>

 				<tr><th><wicket:message key="gb.enableTickets"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useTickets" tabindex="7" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useTicketsDescription"></wicket:message></span></label></td></tr>

 				<tr><th><wicket:message key="gb.enableDocs"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useDocs" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useDocsDescription"></wicket:message></span></label></td></tr>

+				<tr><th><wicket:message key="gb.enableIncrementalRevisionNumbers"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useIncrementalRevisionNumbers" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useIncrementalRevisionNumbersDescription"></wicket:message></span></label></td></tr>

 				<tr><th><wicket:message key="gb.showRemoteBranches"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="showRemoteBranches" tabindex="9" /> &nbsp;<span class="help-inline"><wicket:message key="gb.showRemoteBranchesDescription"></wicket:message></span></label></td></tr>

 				<tr><th><wicket:message key="gb.showReadme"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="showReadme" tabindex="10" /> &nbsp;<span class="help-inline"><wicket:message key="gb.showReadmeDescription"></wicket:message></span></label></td></tr>

 				<tr><th><wicket:message key="gb.skipSizeCalculation"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="skipSizeCalculation" tabindex="11" /> &nbsp;<span class="help-inline"><wicket:message key="gb.skipSizeCalculationDescription"></wicket:message></span></label></td></tr>

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index d68d6550..2cbb88cc 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -422,6 +422,7 @@ public class EditRepositoryPage extends RootSubPage {
 				new FederationTypeRenderer()));

 		form.add(new CheckBox("useTickets"));

 		form.add(new CheckBox("useDocs"));

+		form.add(new CheckBox("useIncrementalRevisionNumbers"));

 		form.add(new CheckBox("showRemoteBranches"));

 		form.add(new CheckBox("showReadme"));

 		form.add(new CheckBox("skipSizeCalculation"));