ARROW-17777: [Dev] Update the pull request merge script to work with master or main

[lafiona]

trafficstars

Overview

The goal of this pull request is to update the GitHub merge script to work with a repository default branch named master or main, as part of the effort to rename the Apache Arrow repository's default branch to main. The parent Jira ticket can be found here.

Implementation

• Added a function named git_default_branch_name to dev/merge_arrow_pr.py.
• Used the function to replace hard-coded usages of master in the file.

Testing

• Ran the dev/merge_arrow_pr.py in debug mode to confirm that there are no errors when attempting to merge an existing pull request.

Notes

Thank you @kevingurney for your help with this pull request!

[github-actions[bot]]

https://issues.apache.org/jira/browse/ARROW-17777

[github-actions[bot]]

:warning: Ticket has not been started in JIRA, please click 'Start Progress'.

[assignUser]

@lafiona I see that this has been ready for review for a while. Visibility for the status off PRs is not great at the moment (we constantly >250 open in recent times) so feel free to ping potential reviewers directly (e.g. @raulcd, @jorisvandenbossche, me ...) to move things forward!

[assignUser]

(oh and we have recently worked quite a lot on the merge script to enable the use of github issues, so you will need to rebase and fix conflicts :) )

[lafiona]

@lafiona I see that this has been ready for review for a while. Visibility for the status off PRs is not great at the moment (we constantly >250 open in recent times) so feel free to ping potential reviewers directly (e.g. @raulcd, @jorisvandenbossche, me ...) to move things forward!

@assignUser thank you for the suggestion to directly ping reviewers! I will keep this in mind.

For this pull request, I'll rebase, fix conflicts, and comment here again. Thank you!

[lafiona]

@assignUser Thank you for your quick review! This is all set from my end.

[lafiona]

Hi all, my apologies for the notifications: as I was trying to resolve the change requested by @assignUser, I accidentally unrequested review from all other previously reviewed reviewers. As I am trying to add each reviewer back, I can only add one at a time.

What is the recommended way to revert the review request to the previous state?

[assignUser]

This is a failing of th GitHub ui, with the small arrow-circle you can only re-request one review and it will automatically un-request the other ones. Multi request works via the drop-down (which you might not have access to?) I will request the reviews :)

[github-actions[bot]]

• Closes: #33005

[github-actions[bot]]

:warning: GitHub issue #33005 has been automatically assigned in GitHub to PR creator.

[github-actions[bot]]

:warning: GitHub issue #33005 has been automatically assigned in GitHub to PR creator.

[ursabot]

Benchmark runs are scheduled for baseline = 2e3683b78e896cb7f9524a8c55fdfb2026b6f192 and contender = 3d26a4330594b6d6ce21a7dc0cb5a77367b98cfd. 3d26a4330594b6d6ce21a7dc0cb5a77367b98cfd is a master commit associated with this PR. Results will be available as each benchmark for each run completes. Conbench compare runs links: [Finished :arrow_down:0.0% :arrow_up:0.0%] ec2-t3-xlarge-us-east-2 [Failed :arrow_down:0.39% :arrow_up:0.0%] test-mac-arm [Finished :arrow_down:0.0% :arrow_up:0.0%] ursa-i9-9960x [Finished :arrow_down:0.31% :arrow_up:0.03%] ursa-thinkcentre-m75q Buildkite builds: [Finished] 3d26a433 ec2-t3-xlarge-us-east-2 [Finished] 3d26a433 test-mac-arm [Finished] 3d26a433 ursa-i9-9960x [Finished] 3d26a433 ursa-thinkcentre-m75q [Finished] 2e3683b7 ec2-t3-xlarge-us-east-2 [Failed] 2e3683b7 test-mac-arm [Finished] 2e3683b7 ursa-i9-9960x [Finished] 2e3683b7 ursa-thinkcentre-m75q Supported benchmarks: ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True test-mac-arm: Supported benchmark langs: C++, Python, R ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java