ARROW-6121: [Tools] Improve merge tool ergonomics#5000
Closed
fsaintjacques wants to merge 4 commits intoapache:masterfrom
Closed
ARROW-6121: [Tools] Improve merge tool ergonomics#5000fsaintjacques wants to merge 4 commits intoapache:masterfrom
fsaintjacques wants to merge 4 commits intoapache:masterfrom
Conversation
kou
reviewed
Aug 3, 2019
Member
kou
left a comment
kou
left a comment
There was a problem hiding this comment.
I like this improvement.
How about renaming dev/merge.conf to dev/merge.conf.example, dev/merge.conf.sample or something? Developers may think that we can use dev/merge.conf directly without copying this to ~/.config.arrow/merge.conf.
pitrou
reviewed
Aug 6, 2019
dev/merge_arrow_pr.py
Outdated
Member
There was a problem hiding this comment.
Are we sure those are always set both? Should we not have:
if not username:
username = cmd.prompt(...)
if not password:
password = cmd.getpass(...)
Contributor
Author
There was a problem hiding this comment.
That would be weird to set one and not the other, but we could.
Member
There was a problem hiding this comment.
Someone paranoid may not like to store a password in a conf file or an environment variable.
Member
There was a problem hiding this comment.
We may as well make this change. I tested the script so we can merge this one this is addressed
- merge_arrow_pr.py now accepts the pull-request number as a single optional argument, e.g. `merge_arrow_pr.py 4921`. - merge_arrow_pr.py can optionally read a configuration file located in `~/.config/arrow/merge.conf` which contains options like jira credentials. See the `dev/merge.conf` file as example
This explicits that this file is not used and must be installed.
wesm
force-pushed
the
ARROW-6121-merge-ergonomic
branch
from
aa7bbd6 to
5298308
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
./merge_arrow_pr.py 4921.~/.config/arrow/merge.confwhich contains options like jira credentials. See thedev/merge.conffile as example