Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

344: PR should warn when source branch is an upstream branch #555

Closed
wants to merge 2 commits into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Mar 31, 2020

Hi all,

please review this patch that warns contributors that creates a poll request
from a branch that is already present in the upstream repository. This is rarely
what you want to do and therefore we should issue a warning.

Testing:

  • make test passes on Linux x64

Thanks,
Erik


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-344: PR should warn when source branch is an upstream branch

Reviewers

Download

$ git fetch https://git.openjdk.java.net/skara pull/555/head:pull/555
$ git checkout pull/555

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 31, 2020

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 31, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Mar 31, 2020

@edvbld This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

344: PR should warn when source branch is an upstream branch

Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 32bba611984aa1e8f83e32f1165e1e26ebb93d53.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Mar 31, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Mar 31, 2020

Thanks @rwestberg for reviewing! Based on a offline discussion I changed HostedBranch from being an interface to a class.

Copy link
Member

@rwestberg rwestberg left a comment

Even better! :)

@edvbld
Copy link
Member Author

@edvbld edvbld commented Mar 31, 2020

/integrate

@openjdk openjdk bot closed this Mar 31, 2020
@openjdk openjdk bot added integrated and removed ready labels Mar 31, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Mar 31, 2020

@edvbld The following commits have been pushed to master since your change was applied:

  • 32bba61: 340: Infer master for repos in the same org for merge style PRs
  • 87965d8: 343: Use ssh -G for parsing ssh configuration files

Your commit was automatically rebased without conflicts.

Pushed as commit c231092.

@openjdk openjdk bot removed the rfr label Mar 31, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 31, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: c231092
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-03-31 14:47:28 +0000
URL: https://git.openjdk.java.net/skara/commit/c231092f

344: PR should warn when source branch is an upstream branch

Reviewed-by: rwestberg

! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryHostedRepository.java
+ forge/src/main/java/org/openjdk/skara/forge/HostedBranch.java
! forge/src/main/java/org/openjdk/skara/forge/HostedRepository.java
! forge/src/main/java/org/openjdk/skara/forge/github/GitHubRepository.java
! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java
! test/src/main/java/org/openjdk/skara/test/TestHostedRepository.java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants