introduces writeSignoffCommit and requireScore features

Author: Robert Führicht

src/main/distrib/data/defaults.properties

@@ -582,6 +582,13 @@ tickets.acceptNewPatchsets = true
 # SINCE 1.4.0
 tickets.requireApproval = false
 
+# Set to a value >= 0 to require at least that cumulated score on a patchset to merge
+# via the WebUI. Requires requireApproval set to true on a repository.
+# Set to negative values to disable.
+#
+# SINCE 1.9.0
+tickets.requireScore = -1
+
 # Default setting to control how patchsets are merged to the integration branch.
 # Valid values: 
 # MERGE_ALWAYS       - Always merge with a merge commit. Every ticket will show up as a branch,
@@ -631,6 +638,15 @@ tickets.redis.url =
 # SINCE 1.4.0
 tickets.perPage = 25
 
+# Appends the reviewers on a ticket in
+#	'Signed-off-by: author <author@example.com>'
+# lines in the merge commit message when the WebUI merge
+# button is clicked.
+# Set to true to enable.
+#
+# SINCE 1.9.0
+tickets.writeSignoffCommit = false
+
 # The folder where plugins are loaded from.
 #
 # SINCE 1.5.0

src/main/java/com/gitblit/client/EditRepositoryDialog.java

@@ -96,6 +96,10 @@ public class EditRepositoryDialog extends JDialog {
 
 	private JCheckBox requireApproval;
 
+	private JComboBox requireScore;
+
+	private JCheckBox writeSignoffCommit;
+
 	private JComboBox mergeToField;
 
 	private JCheckBox useIncrementalPushTags;
@@ -221,6 +225,12 @@ private void initialize(int protocolVersion, RepositoryModel anRepository) {
 				anRepository.acceptNewPatchsets);
 		requireApproval = new JCheckBox(Translation.get("gb.requireApprovalDescription"),
 				anRepository.requireApproval);
+		Integer [] 	scores = { 0, 2, 4, 5, 6, 8 };
+		requireScore = new JComboBox(scores);
+		requireScore.setSelectedItem(anRepository.requireScore);
+
+		writeSignoffCommit = new JCheckBox(Translation.get("gb.writeSignoffDescription"),
+				anRepository.writeSignoffCommit);
 
 		if (ArrayUtils.isEmpty(anRepository.availableRefs)) {
 			mergeToField = new JComboBox();
@@ -330,6 +340,10 @@ public void itemStateChanged(ItemEvent e) {
 				acceptNewPatchsets));
 		fieldsPanel.add(newFieldPanel(Translation.get("gb.requireApproval"),
 				requireApproval));
+		fieldsPanel.add(newFieldPanel(Translation.get("gb.requireScore"),
+				requireScore));
+		fieldsPanel.add(newFieldPanel(Translation.get("gb.writeSignoffCommit"),
+				writeSignoffCommit));
 		fieldsPanel.add(newFieldPanel(Translation.get("gb.mergeTo"), mergeToField));
 		fieldsPanel
 		.add(newFieldPanel(Translation.get("gb.enableIncrementalPushTags"), useIncrementalPushTags));
@@ -588,6 +602,8 @@ private boolean validateFields() {
 		repository.acceptNewPatchsets = acceptNewPatchsets.isSelected();
 		repository.acceptNewTickets = acceptNewTickets.isSelected();
 		repository.requireApproval = requireApproval.isSelected();
+		repository.requireScore = (Integer) requireScore.getSelectedItem();
+		repository.writeSignoffCommit = writeSignoffCommit.isSelected();
 		repository.mergeTo = mergeToField.getSelectedItem() == null ? null
 				: Repository.shortenRefName(mergeToField.getSelectedItem().toString());
 		repository.useIncrementalPushTags = useIncrementalPushTags.isSelected();

src/main/java/com/gitblit/git/PatchsetReceivePack.java

@@ -1268,7 +1268,28 @@ private void updateReflog(RefUpdate ru) {
 	public MergeStatus merge(TicketModel ticket) {
 		PersonIdent committer = new PersonIdent(user.getDisplayName(), StringUtils.isEmpty(user.emailAddress) ? (user.username + "@gitblit") : user.emailAddress);
 		Patchset patchset = ticket.getCurrentPatchset();
-		String message = MessageFormat.format("Merged #{0,number,0} \"{1}\"", ticket.number, ticket.title);
+		StringBuilder messageBuilder = new StringBuilder();
+		messageBuilder.append(MessageFormat.format("Merged #{0,number,0} \"{1}\"", ticket.number, ticket.title));
+
+		// Add Signed-off-by tags to commit message footer if there are reviewers on this patchset
+		// and the setting is enabled on this repo.
+		if (repository.writeSignoffCommit) {
+			messageBuilder.append("\n\n");
+			for (Change change : ticket.getReviews(patchset)) {
+				UserModel ruser = gitblit.getUserModel(change.author);
+				messageBuilder.append(MessageFormat.format(
+							"Signed-off-by: {0} <{1}>\n", 
+							ruser.getDisplayName(), 
+							StringUtils.isEmpty(ruser.emailAddress) ? (ruser.username + "@gitblit") : ruser.emailAddress
+						)
+				);
+			}
+			// Delete extra the line break at the end of the message
+			messageBuilder.deleteCharAt(messageBuilder.length()-1);
+		}
+		
+		// Convert the constructed message to String and continue
+		String message = messageBuilder.toString();
 		Ref oldRef = null;
 		try {
 			oldRef = getRepository().getRef(ticket.mergeTo);

src/main/java/com/gitblit/manager/RepositoryManager.java

@@ -899,6 +899,8 @@ private RepositoryModel loadRepositoryModel(String repositoryName) {
 			model.acceptNewPatchsets = getConfig(config, "acceptNewPatchsets", true);
 			model.acceptNewTickets = getConfig(config, "acceptNewTickets", true);
 			model.requireApproval = getConfig(config, "requireApproval", settings.getBoolean(Keys.tickets.requireApproval, false));
+			model.requireScore = getConfig(config, "requireScore", settings.getInteger(Keys.tickets.requireScore, -1));
+			model.writeSignoffCommit = getConfig(config, "writeSignoffCommit", settings.getBoolean(Keys.tickets.writeSignoffCommit, false));
 			model.mergeTo = getConfig(config, "mergeTo", null);
 			model.mergeType = MergeType.fromName(getConfig(config, "mergeType", settings.getString(Keys.tickets.mergeType, null)));
 			model.useIncrementalPushTags = getConfig(config, "useIncrementalPushTags", false);

src/main/java/com/gitblit/models/RepositoryModel.java

@@ -88,7 +88,9 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
 	public CommitMessageRenderer commitMessageRenderer;
 	public boolean acceptNewPatchsets;
 	public boolean acceptNewTickets;
-	public boolean requireApproval;
+	public boolean requireApproval;
+	public int requireScore;
+	public boolean writeSignoffCommit;
 	public String mergeTo;
 	public MergeType mergeType;
 

src/main/java/com/gitblit/models/TicketModel.java

@@ -491,7 +491,6 @@ public List<Change> getReviews(Patchset patchset) {
 		return new ArrayList<Change>(reviews.values());
 	}
 
-
 	public boolean isApproved(Patchset patchset) {
 		if (patchset == null) {
 			return false;
@@ -512,6 +511,15 @@ public boolean isApproved(Patchset patchset) {
 		return approved && !vetoed;
 	}
 
+	public int getScore(Patchset patchset) {
+		int score = 0;
+		
+		for (Change change : getReviews(patchset)) {
+			score += change.review.score.getValue();
+		}
+		return score;
+	}
+
 	public boolean isVetoed(Patchset patchset) {
 		if (patchset == null) {
 			return false;

src/main/java/com/gitblit/wicket/GitBlitWebApp.properties

@@ -555,6 +555,10 @@ gb.acceptNewTickets = allow new tickets
 gb.acceptNewTicketsDescription = allow creation of bug, enhancement, task ,etc tickets
 gb.requireApproval = require approvals
 gb.requireApprovalDescription = patchsets must be approved before merge button is enabled
+gb.requireScore = require score
+gb.requireScoreDescription = patchsets must be rated this high before merge button is enabled
+gb.writeSignoffCommit = write signoff commit
+gb.writeSignoffCommitDescription = reviewed patchsets will have 'Signed-off-by: reviewer <reviewer@example.com>' commit lines appended on merge 
 gb.topic = topic
 gb.proposalTickets = proposed changes
 gb.bugTickets = bugs

src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html

@@ -122,6 +122,8 @@ <h4><wicket:message key="gb.ticketSettings"></wicket:message></h4>
 			<div wicket:id="acceptNewPatchsets"></div>
 			<div wicket:id="acceptNewTickets"></div>
 			<div wicket:id="requireApproval"></div>
+			<div wicket:id="requireScore"></div>
+			<div wicket:id="writeSignoffCommit"></div>
 			<div wicket:id="mergeTo"></div>
 			<div wicket:id="mergeType"></div>
 

src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java

@@ -453,7 +453,17 @@ protected void onSubmit() {
 				getString("gb.requireApproval"),
 				getString("gb.requireApprovalDescription"),
 				new PropertyModel<Boolean>(repositoryModel, "requireApproval")));
-
+		List<Integer> scores = Arrays.asList(-1, 0, 2, 4, 5, 6, 8);
+		form.add(new ChoiceOption<Integer>("requireScore",
+				getString("gb.requireScore"),
+				getString("gb.requireScoreDescription"),
+				new DropDownChoice<Integer>("choice",
+						new PropertyModel<Integer>(repositoryModel, "requireScore"),
+						scores)));
+		form.add(new BooleanOption("writeSignoffCommit",
+				getString("gb.writeSignoffCommit"),
+				getString("gb.writeSignoffCommitDescription"),
+				new PropertyModel<Boolean>(repositoryModel, "writeSignoffCommit")));
 		form.add(new ChoiceOption<String>("mergeTo",
 				getString("gb.mergeTo"),
 				getString("gb.mergeToDescription"),

src/main/java/com/gitblit/wicket/pages/TicketPage.java

@@ -1407,6 +1407,9 @@ protected Component createMergePanel(UserModel user, RepositoryModel repository)
 		if (repository.requireApproval) {
 			// repository requires approval
 			allowMerge = ticket.isOpen() && ticket.isApproved(patchset);
+			if (repository.requireScore > -1) {
+				allowMerge &= ticket.getScore(patchset) >= repository.requireScore; 
+			}
 		} else {
 			// vetoes are binding
 			allowMerge = ticket.isOpen() && !ticket.isVetoed(patchset);