nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

When creating a pull request, how do you ensure the source branch is branched from destination head?

Mark Ingram

Our workflow requires us to rebase our branches, before we create a pull request, in order to preserve the linear merge graph. It would be useful to be able to automatically decline a pull request (or as a minimum present some sort of warning, or notification) if a pull request has been accepted to upstream, since your original branch or last rebase. Is there any built in feature or plugin via the marketplace that supports this?

Accepted answers

All comments

Mark McCormack (Adaptavist)

@Mark Ingram - there is a paid add-on in the Marketplace called ScriptRunner for Stash that supports this. The documentation outlines how to block the creation of out of date Pull Requests. I think that might meet your needs.

Mark Ingram

Thanks, that's nearly exactly what I need, except we would like to be able to add multiple pull requests, but just block the merging if the request is out of date. With the solution you provided, you can only create 1 pull request at once. Is this possible?

JamieA

Hi Mark... you want a mergecheck. I'm surprised this isn't already in the plugin, but it doesn't seem to be.

You can add a custom merge check with the following script:

import com.onresolve.scriptrunner.canned.stash.events.BlockOutOfDatePullRequests
 
def pullRequest = mergeRequest.pullRequest
def aheadBehindInfo = new BlockOutOfDatePullRequests().isPullRequestUpToDate(pullRequest)
 
if (! aheadBehindInfo.alreadyRebased) {
    mergeRequest.veto("Can't merge because out of date", "Please rebase then have another go...")
}

which looks like:

image2015-9-18 17:3:10.png

It can be difficult though to rebase if you've already merged to your feature branch from the target. But I guess once people have been bitten once they'll rebase rather than merge...

There is more chat about this kind of thing here: http://www.adaptavist.com/w/inside-adaptavists-stash-pull-request-workflow/

image2015-9-18 17:2:51.png

image2015-9-18 17:2:36.png

image2015-9-18 17:3:10.png

JamieA

I'm not really sure what you mean... you can always only create one PR per source and target branch combination. I would recommend using this policy, along with my answer. It's better to get people to rebase at the time they try to create the PR, otherwise they may well not even notice it's out of date. But also you need the merge check in my answer because it can go out of date. Ideally you want to notify them when it becomes out of date, as the person merging is probably not the person that can rebase it.

Mark Ingram

I think this is exactly what I'm after! I'll check it out and accept the answer if it works. Thanks.

JamieA

No worries, get in touch with us via https://productsupport.adaptavist.com/servicedesk/customer/portal/3 if you need some hands-on help making it work.

Peguiron Ernst, Mathias

Hello,

I tried the above but the line :

import com.onresolve.scriptrunner.canned.stash.events.BlockOutOfDatePullRequests

Throws an error "unable to resolve class "com.onresolve.scriptrunner.canned.stash.events.BlockOutOfDatePullRequests"

I'm on Bitbucket server 5.12.1 and Scriptrunner 5.4.18

Jaideep Padhye

@JamieA I'm still looking for the answer too. Could you please suggest how to get this working.

dmitry_gvcnza

here is what I came up with:

import com.atlassian.bitbucket.commit.CommitsBetweenRequest
import com.atlassian.bitbucket.commit.Commit
import com.atlassian.bitbucket.util.PageRequestImpl
import com.atlassian.bitbucket.util.Page
import com.atlassian.bitbucket.commit.CommitService
import com.atlassian.sal.api.component.ComponentLocator

def pageLimit = com.atlassian.bitbucket.util.PageRequest.MAX_PAGE_LIMIT

def CommitService commitService = ComponentLocator.getComponent(CommitService)

def pullRequest = mergeRequest.pullRequest

def toRefLatestCommit = pullRequest.toRef.getLatestCommit()

CommitsBetweenRequest.Builder builder = new CommitsBetweenRequest.Builder(mergeRequest.pullRequest);
CommitsBetweenRequest cbr = builder.build();
Page<Commit> cs = commitService.getCommitsBetween(cbr, new PageRequestImpl(0, pageLimit ))

def isUpToDate = cs.getValues().any{c -> c.getParents().any { p -> p.getId() == toRefLatestCommit} }

if (!isUpToDate) {
mergeRequest.veto("Can't merge because needs rebase", "Please rebase first.)
}

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

bitbucket-server

bitbucket-administration