[ARROW-6178] [Developer] Don't fail in merge script on bad primary author input in multi-author PRs

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 0.15.0
• Component/s: Developer Tools
• Labels: pull-request-available
• External issue URL: https://github.com/apache/arrow/issues/22571
• Assignee: Wes McKinney
• Reporter: Wes McKinney
• Created: 08/Aug/19 16:39
• Updated: 11/Jan/23 07:45
• Resolved: 23/Aug/19 00:25

Description

I was going on autopilot in a multi-author PR and this happened

Switched to branch 'PR_TOOL_MERGE_PR_5000_MASTER'
Automatic merge went well; stopped before committing as requested
Author 1: François Saint-Jacques <[e-mail]>
Author 2: Wes McKinney <[e-mail]>
Enter primary author in the format of "name <email>" [François Saint-Jacques <[e-mail]>]: y
fatal: --author '"y"' is not 'Name <email>' and matches no existing author
Command failed: ['git', 'commit', '--no-verify', '--author="y"', '-m', 'ARROW-6121: [Tools] Improve merge tool ergonomics', '-m', '- merge_arrow_pr.py now accepts the pull-request number as a single optional argument, e.g. `./merge_arrow_pr.py 4921`.\r\n- 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', '-m', 'Closes #5000 from fsaintjacques/ARROW-6121-merge-ergonomic and squashes the following commits:', '-m', '5298308d7 <Wes McKinney> Handle username/password separately (in case username is set but not password)\n581653735 <François Saint-Jacques> Rename merge.conf to merge.conf.sample\n7c51ca8f0 <François Saint-Jacques> Add license to config file\n1213946bd <François Saint-Jacques> ARROW-6121:  Improve merge tool ergonomics', '-m', 'Lead-authored-by: y\nCo-authored-by: François Saint-Jacques <[e-mail]>\nCo-authored-by: Wes McKinney <[e-mail]>\nSigned-off-by: Wes McKinney <[e-mail]>']
With output:
--------------
b''
--------------
Traceback (most recent call last):
  File "dev/merge_arrow_pr.py", line 530, in <module>
    if pr.is_merged:
  File "dev/merge_arrow_pr.py", line 515, in cli
    PROJECT_NAME = os.environ.get('ARROW_PROJECT_NAME') or 'arrow'
  File "dev/merge_arrow_pr.py", line 420, in merge
    '--author="%s"' % primary_author] +
  File "dev/merge_arrow_pr.py", line 89, in run_cmd
    print('--------------')
  File "dev/merge_arrow_pr.py", line 81, in run_cmd
    try:
  File "/home/wesm/miniconda/envs/arrow-3.7/lib/python3.7/subprocess.py", line 395, in check_output
    **kwargs).stdout
  File "/home/wesm/miniconda/envs/arrow-3.7/lib/python3.7/subprocess.py", line 487, in run
    output=stdout, stderr=stderr)

If the input does not match the expected format, we should loop to request input again rather than failing out (which requires messy manual cleanup of temporary branches)

Issue Links

• links to: GitHub Pull Request #5149