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

1085: Gitlab PR has bad link to patch file #1191

Closed
wants to merge 2 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Jun 22, 2021

The link generated under the "Reviewing" header in a PR description works fine on Github, but on Gitlab, the link has a Github style form which does not work.


Progress

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

Issue

  • SKARA-1085: Gitlab PR has bad link to patch file

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1191/head:pull/1191
$ git checkout pull/1191

Update a local copy of the PR:
$ git checkout pull/1191
$ git pull https://git.openjdk.java.net/skara pull/1191/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1191

View PR using the GUI difftool:
$ git pr show -t 1191

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1191.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 22, 2021

👋 Welcome back ihse! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Jun 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 22, 2021

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Jun 22, 2021

@magicus This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

After integration, the commit message for the final commit will be:

1085: Gitlab PR has bad link to patch file

Reviewed-by: erikj

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 8801187: 1092: /backport commit command does not validate non existing repos

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

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

@openjdk openjdk bot added the ready label Jun 22, 2021
@magicus
Copy link
Member Author

@magicus magicus commented Jul 6, 2021

So, it turned out that GitLab is a bit too smart for it's own best... If it finds that a part of a URL matches a MR, it will rewrite it to "!", e.g. "!99". So the diff URLs got converted to !99.diff. Which the javascript, or whatever, that should have restored the full MR URL, could not detect and rewrite back to the proper URL. sigh I worked around this by adding a double slash, which throw off the pattern detector.

erikj79
erikj79 approved these changes Jul 6, 2021
@magicus
Copy link
Member Author

@magicus magicus commented Jul 6, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 6, 2021

Going to push as commit 2540619.
Since your change was applied there have been 2 commits pushed to the master branch:

  • ac074bc: 1095: Ignore tags in pr branches when notifying
  • 8801187: 1092: /backport commit command does not validate non existing repos

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 6, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 6, 2021

@magicus Pushed as commit 2540619.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@magicus magicus deleted the 1085-gitlab-diff-link branch Jul 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants