Revise push/mirror tickets branch triggering

3 files changed, 61 insertions, 6 deletions

diff --git a/src/main/java/com/gitblit/git/GitblitReceivePack.java b/src/main/java/com/gitblit/git/GitblitReceivePack.java
index 605632cf..e3e2faeb 100644
--- a/src/main/java/com/gitblit/git/GitblitReceivePack.java
+++ b/src/main/java/com/gitblit/git/GitblitReceivePack.java
@@ -51,7 +51,6 @@ import com.gitblit.manager.IGitblit;
 import com.gitblit.models.RepositoryModel;

 import com.gitblit.models.UserModel;

 import com.gitblit.tickets.BranchTicketService;

-import com.gitblit.tickets.BranchTicketService.TicketsBranchUpdated;

 import com.gitblit.utils.ArrayUtils;

 import com.gitblit.utils.ClientLogger;

 import com.gitblit.utils.CommitCache;

@@ -344,12 +343,13 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P
 		} catch (Exception e) {

 			LOGGER.error(MessageFormat.format("Failed to update {0} pushlog", repository.name), e);

 		}

-		

+

 		// check for updates pushed to the BranchTicketService branch

+		// if the BranchTicketService is active it will reindex, as appropriate

 		for (ReceiveCommand cmd : commands) {

 			if (Result.OK.equals(cmd.getResult())

 					&& BranchTicketService.BRANCH.equals(cmd.getRefName())) {

-				rp.getRepository().fireEvent(new TicketsBranchUpdated(repository));

+				rp.getRepository().fireEvent(new ReceiveCommandEvent(repository, cmd));

 			}

 		}

 

diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
index 2044f604..c0ab8aeb 100644
--- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java
+++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
@@ -60,6 +60,7 @@ import com.gitblit.models.TicketModel.Patchset;
 import com.gitblit.models.TicketModel.PatchsetType;

 import com.gitblit.models.TicketModel.Status;

 import com.gitblit.models.UserModel;

+import com.gitblit.tickets.BranchTicketService;

 import com.gitblit.tickets.ITicketService;

 import com.gitblit.tickets.TicketMilestone;

 import com.gitblit.tickets.TicketNotifier;

@@ -105,7 +106,7 @@ public class PatchsetReceivePack extends GitblitReceivePack {
 

 	protected final TicketNotifier ticketNotifier;

 

-	private boolean requireCleanMerge;

+	private boolean requireMergeablePatchset;

 

 	public PatchsetReceivePack(IGitblit gitblit, Repository db, RepositoryModel repository, UserModel user) {

 		super(gitblit, db, repository, user);

@@ -257,12 +258,26 @@ public class PatchsetReceivePack extends GitblitReceivePack {
 	/** Execute commands to update references. */

 	@Override

 	protected void executeCommands() {

+		// we process patchsets unless the user is pushing something special

+		boolean processPatchsets = true;

+		for (ReceiveCommand cmd : filterCommands(Result.NOT_ATTEMPTED)) {

+			if (ticketService instanceof BranchTicketService

+					&& BranchTicketService.BRANCH.equals(cmd.getRefName())) {

+				// the user is pushing an update to the BranchTicketService data

+				processPatchsets = false;

+			}

+		}

+

 		// workaround for JGit's awful scoping choices

 		//

 		// reset the patchset refs to NOT_ATTEMPTED (see validateCommands)

 		for (ReceiveCommand cmd : filterCommands(Result.OK)) {

 			if (isPatchsetRef(cmd.getRefName())) {

 				cmd.setResult(Result.NOT_ATTEMPTED);

+			} else if (ticketService instanceof BranchTicketService

+					&& BranchTicketService.BRANCH.equals(cmd.getRefName())) {

+				// the user is pushing an update to the BranchTicketService data

+				processPatchsets = false;

 			}

 		}

 

@@ -292,7 +307,7 @@ public class PatchsetReceivePack extends GitblitReceivePack {
 				continue;

 			}

 

-			if (isPatchsetRef(cmd.getRefName())) {

+			if (isPatchsetRef(cmd.getRefName()) && processPatchsets) {

 				if (ticketService == null) {

 					sendRejection(cmd, "Sorry, the ticket service is unavailable and can not accept patchsets at this time.");

 					continue;

@@ -393,6 +408,8 @@ public class PatchsetReceivePack extends GitblitReceivePack {
 				for (ReceiveCommand cmd : toApply) {

 					if (cmd.getResult() == Result.NOT_ATTEMPTED) {

 						sendRejection(cmd, "lock error: {0}", err.getMessage());

+						LOGGER.error(MessageFormat.format("failed to lock {0}:{1}",

+								repository.name, cmd.getRefName()), err);

 					}

 				}

 			}

@@ -539,7 +556,7 @@ public class PatchsetReceivePack extends GitblitReceivePack {
 		case MERGEABLE:

 			break;

 		default:

-			if (ticket == null || requireCleanMerge) {

+			if (ticket == null || requireMergeablePatchset) {

 				sendError("");

 				sendError("Your patchset can not be cleanly merged into {0}.", forBranch);

 				sendError("Please rebase your patchset and push again.");

diff --git a/src/main/java/com/gitblit/git/ReceiveCommandEvent.java b/src/main/java/com/gitblit/git/ReceiveCommandEvent.java
new file mode 100644
index 00000000..84dabb35
--- /dev/null
+++ b/src/main/java/com/gitblit/git/ReceiveCommandEvent.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.git;
+
+import org.eclipse.jgit.events.RefsChangedEvent;
+import org.eclipse.jgit.transport.ReceiveCommand;
+
+import com.gitblit.models.RepositoryModel;
+
+/**
+ * The event fired by other classes to allow this service to index tickets.
+ *
+ * @author James Moger
+ */
+public class ReceiveCommandEvent extends RefsChangedEvent {
+
+	public final RepositoryModel model;
+
+	public final ReceiveCommand cmd;
+
+	public ReceiveCommandEvent(RepositoryModel model, ReceiveCommand cmd) {
+		this.model = model;
+		this.cmd = cmd;
+	}
+}
\ No newline at end of file