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

git-sync should use APIs to find upstream #262

Closed
wants to merge 2 commits into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Nov 21, 2019

Hi all,

this patch changes git-sync to to use the Forge APIs for finding the upstream repository for a personal fork (in case the upstream remote is missing). The big part of this change is making Forge.repository return Optional<HostedRepository> instead of HostedRepository (because a forge may not have the requested repository). Robin, what do you think about these changes?

Thanks,
Erik

Testing

  • Manual testing of git sync, both with and without an upstream remote

Progress

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

Approvers

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 21, 2019

👋 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 (refresh this page to view it).

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 21, 2019

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good, just have one comment!

@openjdk openjdk bot removed the rfr label Nov 21, 2019
@openjdk
Copy link

@openjdk openjdk bot commented Nov 21, 2019

@edvbld This change can now be integrated. The commit message will be:

git-sync should use APIs to find upstream

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

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch:

  • 6bea8f3: Treat Jira 4xx errors different from 5xx

Since there are no conflicts, your changes will automatically be rebased on top of the above commits when integrating. If you prefer to do this manually, please merge master into your branch first.

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

@openjdk openjdk bot added the ready label Nov 21, 2019
@edvbld
Copy link
Member Author

@edvbld edvbld commented Nov 22, 2019

/integrate

@openjdk openjdk bot closed this Nov 22, 2019
@openjdk openjdk bot added integrated and removed ready labels Nov 22, 2019
@openjdk
Copy link

@openjdk openjdk bot commented Nov 22, 2019

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

  • 6bea8f3: Treat Jira 4xx errors different from 5xx

Your commit was automatically rebased without conflicts.

Pushed as commit 2f8cfc9.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 22, 2019

Mailing list message from Erik Helin on skara-dev:

Changeset: 2f8cfc9
Author: Erik Helin
Date: 2019-11-22 13:13:55 +0000
URL: https://git.openjdk.java.net/skara/commit/2f8cfc90

git-sync should use APIs to find upstream

Reviewed-by: rwestberg

! bot/src/main/java/org/openjdk/skara/bot/BotRunnerConfiguration.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryHost.java
! cli/src/main/java/org/openjdk/skara/cli/GitFork.java
! cli/src/main/java/org/openjdk/skara/cli/GitPr.java
! cli/src/main/java/org/openjdk/skara/cli/GitSync.java
! cli/src/main/java/org/openjdk/skara/cli/Remote.java
! forge/src/main/java/org/openjdk/skara/forge/Forge.java
! forge/src/main/java/org/openjdk/skara/forge/github/GitHubHost.java
! forge/src/main/java/org/openjdk/skara/forge/github/GitHubRepository.java
! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabHost.java
! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java
! test/src/main/java/org/openjdk/skara/test/CensusBuilder.java
! test/src/main/java/org/openjdk/skara/test/HostCredentials.java
! test/src/main/java/org/openjdk/skara/test/TestHost.java

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