Import commits from apache/arrow

[kou]

We need only commits for https://github.com/apache/arrow/tree/main/js . Other commits such as commits for .github/ aren't needed. We need to adjust other files for this repository.

We can do this by the following command lines:

git clone git@github.com:apache/arrow-js.git
cd arrow-js
git remote add arrow https://github.com/apache/arrow.git
git fetch arrow
git switch -c arrow-main-js arrow/main
git filter-branch --subdirectory-filter js
git switch main
(git log --format=%H --reverse arrow-main-js | while read commit; do git cherry-pick $commit; done)
git push origin

[kou]

Done.

[kou]

Oh, we named to js/ from javascript/ by apache/arrow#578 . We must collect commits for javascript/ too.

[kou]

git clone git@github.com:apache/arrow-js.git
cd arrow-js
git remote add arrow https://github.com/apache/arrow.git
git fetch arrow
git switch -c arrow-main-javascript arrow/main
FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --subdirectory-filter javascript
git switch -c arrow-main-js arrow/main
FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --subdirectory-filter js
# 7cb220cac2c6d497648486e2e65a3561848dcea4 is the commit that adds .asf.yaml.
git switch -c main-new 7cb220cac2c6d497648486e2e65a3561848dcea4
# Ignore the last javascript/ -> js/ commit
(git log --format=%H --reverse arrow-main-javascript | head -n -1 | while read commit; do git cherry-pick $commit; done)
# Ignore the first javascript/ -> js/ commit
(git log --format=%H --reverse arrow-main-js | tail -n +2 | while read commit; do git cherry-pick $commit; done)
git push --force-with-lease origin main-new:main

I tried this but force push is rejected:

remote: Resolving deltas: 100% (2761/2761), done.
remote: error: GH006: Protected branch update failed for refs/heads/main.
remote: 
remote: - Cannot force-push to this branch
To github.com:apache/arrow-js.git
 ! [remote rejected]       main-new -> main (protected branch hook declined)
error: failed to push some refs to 'github.com:apache/arrow-js.git'

The missed commit is only http://github.com/apache/arrow/pull/358 and it was moved to js/ immediately by the next commit: apache/arrow#578

So, let's abandon http://github.com/apache/arrow/pull/358 . Sorry...