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

1101: git webrev for mercurial should ignore config defaults for mercurial commands #1197

Closed
wants to merge 1 commit into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Jul 14, 2021

This patch adds --config defaults.log= to the mercurial command used to resolve a revset to a hash. Since this is a very particular use of the log command, we need to be in full control of all options passed to it.

There are likely several other situations like this that should be fixed, but I would rather not spend the time right now trying to implement a general overhaul for handling all of them.


Progress

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

Issue

  • SKARA-1101: git webrev for mercurial should ignore config defaults for mercurial commands

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1197

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 14, 2021

👋 Welcome back erikj! 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 changed the title SKARA-1101 1101: git webrev for mercurial should ignore config defaults for mercurial commands Jul 14, 2021
@openjdk openjdk bot added the rfr label Jul 14, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 14, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Jul 14, 2021

@erikj79 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.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

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

1101: git webrev for mercurial should ignore config defaults for mercurial commands

Reviewed-by: kcr

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Jul 14, 2021
@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Jul 15, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 15, 2021

Going to push as commit 36fdc9b.

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

@openjdk openjdk bot commented Jul 15, 2021

@erikj79 Pushed as commit 36fdc9b.

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

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