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

Save references to materialized branches locally #271

Closed
wants to merge 3 commits into from

Conversation

@rwestberg
Copy link
Member

rwestberg commented Nov 26, 2019

Hi all,

Please review this change that ensure that when bots use Repository.materialize, they always save a named reference to what was fetched. This ensures that subsequent fetches will present these existing refs, and avoid re-fetching commits that already exist locally.

It also fixes a potential bug where the mlbridge archive reader could have fetched from an incorrect branch.

Best regards,
Robin

Progress

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

Approvers

  • Erik Helin (ehelin - Reviewer)
@bridgekeeper

This comment has been minimized.

Copy link

bridgekeeper bot commented Nov 26, 2019

👋 Welcome back rwestberg! 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).

@openjdk openjdk bot added rfr bots labels Nov 26, 2019
@mlbridge

This comment has been minimized.

Copy link

mlbridge bot commented Nov 26, 2019

Webrevs

@edvbld
edvbld approved these changes Nov 27, 2019
Copy link
Member

edvbld left a comment

Looks good!

@openjdk openjdk bot removed the rfr label Nov 27, 2019
@openjdk

This comment has been minimized.

Copy link

openjdk bot commented Nov 27, 2019

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

Save references to materialized branches locally

Reviewed-by: ehelin
  • 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 have been 5 commits pushed to the master branch:

  • 6e2c5bf: Escape potential unintentional markdown formatting when bridging mails
  • f3afc99: Initial version of issue updater
  • 5c3f278: Add --no-token flag to git-pr
  • fe273af: Switch to GitHub's new review comment positioning API
  • 59405b7: Ensure Python 3 compatibility for the hg extension

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 27, 2019
@rwestberg

This comment has been minimized.

Copy link
Member Author

rwestberg commented Nov 27, 2019

/integrate

@openjdk openjdk bot closed this Nov 27, 2019
@openjdk openjdk bot added integrated and removed ready labels Nov 27, 2019
@openjdk

This comment has been minimized.

Copy link

openjdk bot commented Nov 27, 2019

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

  • 6e2c5bf: Escape potential unintentional markdown formatting when bridging mails
  • f3afc99: Initial version of issue updater
  • 5c3f278: Add --no-token flag to git-pr
  • fe273af: Switch to GitHub's new review comment positioning API
  • 59405b7: Ensure Python 3 compatibility for the hg extension

Your commit was automatically rebased without conflicts.

Pushed as commit 1f16634.

@mlbridge

This comment has been minimized.

Copy link

mlbridge bot commented Nov 27, 2019

Mailing list message from Robin Westberg on skara-dev:

Changeset: 1f16634
Author: Robin Westberg
Date: 2019-11-27 12:32:00 +0000
URL: https://git.openjdk.java.net/skara/commit/1f166345

Save references to materialized branches locally

Reviewed-by: ehelin

! bots/hgbridge/src/main/java/org/openjdk/skara/bots/hgbridge/ExporterConfig.java
! bots/hgbridge/src/main/java/org/openjdk/skara/bots/hgbridge/JBridgeBot.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/CensusInstance.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBot.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotFactory.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/PullRequestInstance.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java
! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListArchiveReaderBotTests.java
! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CensusInstance.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java
! bots/submit/src/main/java/org/openjdk/skara/bots/submit/SubmitBotWorkItem.java
! storage/src/main/java/org/openjdk/skara/storage/HostedRepositoryStorage.java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.