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

2080: ini: allow values to be updated #1577

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Oct 27, 2023

Hi all,

please review this patch that makes the INI parser allow values to be updated if they are set multiple times in a file. The below example would result in the key name having the value jane:

name=john
name=jane

Values in sections and sub-sections can now also be updated, the below example would result in the key age in the subsection [person "john"] having the value 47:

[person]
age=0

[person "john"]
age=1

[person "john"]
age=47

This is in line with how Git's INI parser is working, see the following example:

$ printf '[test]\nfoo=bar\n' >> .git/config
$ printf '[test]\nfoo=baz\n' >> .git/config
$ cat .git/config
[test]
foo=bar
[test]
foo=baz
$ git config test.foo
baz

Enabling keys to be updated makes modifying just a single key in a .jcheck/conf easier. Appending the following to any .jcheck/conf would make merge commits requiring reviews:

[checks "reviewer"]
merge=check

This property will be used to simplify AdditionalConfiguration in an upcoming PR.

Thanks,
Erik


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace

Issue

  • SKARA-2080: ini: allow values to be updated (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/skara.git pull/1577/head:pull/1577
$ git checkout pull/1577

Update a local copy of the PR:
$ git checkout pull/1577
$ git pull https://git.openjdk.org/skara.git pull/1577/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1577

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/skara/pull/1577.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 27, 2023

👋 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. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title 2080 2080: ini: allow values to be updated Oct 27, 2023
@openjdk openjdk bot added the rfr label Oct 27, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 27, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 27, 2023

@edvbld 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:

2080: ini: allow values to be updated

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 4 new commits pushed to the master branch:

  • de78b01: 2077: GitLabRepository.recentCommitComments may miss commits on non default branch
  • 4c3c83a: 1962: JiraProject#queryIssues may return duplicate issues
  • 58ba50e: 2071: Track active status for users in IssueTracker
  • 37c874a: 2069: Add group and collaborator methods to Forge and HostedRepository

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 Oct 27, 2023
@edvbld
Copy link
Member Author

edvbld commented Oct 27, 2023

Thanks for reviewing @erikj79 !

/integrate

@openjdk
Copy link

openjdk bot commented Oct 27, 2023

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

  • de78b01: 2077: GitLabRepository.recentCommitComments may miss commits on non default branch
  • 4c3c83a: 1962: JiraProject#queryIssues may return duplicate issues
  • 58ba50e: 2071: Track active status for users in IssueTracker
  • 37c874a: 2069: Add group and collaborator methods to Forge and HostedRepository

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Oct 27, 2023
@openjdk openjdk bot closed this Oct 27, 2023
@openjdk
Copy link

openjdk bot commented Oct 27, 2023

@edvbld Pushed as commit 0c63816.

💡 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