#!/usr/bin/env bash set -e SRC=/tmp/openpilot/ SRC_CLONE=/tmp/openpilot-clone/ OUT=/tmp/openpilot-tiny/ REWRITE_IGNORE_BRANCHES=( dashcam3 devel master-ci nightly release2 release3 release3-staging ) VALIDATE_IGNORE_FILES=( ".github/ISSUE_TEMPLATE/bug_report.md" ".github/pull_request_template.md" ) DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" cd $DIR LOGS_DIR=$DIR/git-rewrite-$(date +"%Y-%m-%dT%H:%M:%S%z") mkdir -p $LOGS_DIR GIT_REWRITE_LOG=$LOGS_DIR/git-rewrite-log.txt BRANCH_DIFF_LOG=$LOGS_DIR/branch-diff-log.txt COMMIT_DIFF_LOG=$LOGS_DIR/commit-diff-log.txt START_TIME=$(date +%s) exec > >(while IFS= read -r line; do CURRENT_TIME=$(date +%s) ELAPSED_TIME=$((CURRENT_TIME - START_TIME)) echo "[${ELAPSED_TIME}s] $line" done | tee -a "$GIT_REWRITE_LOG") 2>&1 # INSTALL git-filter-repo if [ ! -f /tmp/git-filter-repo ]; then echo "Installing git-filter-repo..." curl -sSo /tmp/git-filter-repo https://raw.githubusercontent.com/newren/git-filter-repo/main/git-filter-repo chmod +x /tmp/git-filter-repo fi # MIRROR openpilot if [ ! -d $SRC ]; then echo "Mirroring openpilot..." git clone --mirror https://github.com/commaai/openpilot.git $SRC # 4.18 GiB (488034 objects) cd $SRC echo "Starting size $(du -sh .)" git remote update # the git-filter-repo analysis is bliss - can be found in the repo root/filter-repo/analysis echo "Analyzing with git-filter-repo..." /tmp/git-filter-repo --force --analyze echo "Pushing to openpilot-archive..." # push to archive repo - in smaller parts because the 2 GB push limit - https://docs.github.com/en/get-started/using-git/troubleshooting-the-2-gb-push-limit ARCHIVE_REPO=git@github.com:commaai/openpilot-archive.git git push --prune $ARCHIVE_REPO +refs/heads/master:refs/heads/master # push master first so it's the default branch (when openpilot-archive is an empty repo) git push --prune $ARCHIVE_REPO +refs/heads/*:refs/heads/* # 956.39 MiB (110725 objects) git push --prune $ARCHIVE_REPO +refs/tags/*:refs/tags/* # 1.75 GiB (21694 objects) # git push --mirror $ARCHIVE_REPO || true # fails to push refs/pull/* (deny updating a hidden ref) for pull requests # we fail and continue - more reading: https://stackoverflow.com/a/34266401/639708 and https://blog.plataformatec.com.br/2013/05/how-to-properly-mirror-a-git-repository/ fi # REWRITE master and tags if [ ! -d $SRC_CLONE ]; then echo "Cloning $SRC..." GIT_LFS_SKIP_SMUDGE=1 git clone $SRC $SRC_CLONE cd $SRC_CLONE echo "Checking out old history..." git checkout tags/v0.7.1 > /dev/null 2>&1 # checkout as main, since we need master ref later git checkout -b main echo "Creating setup commits..." # rm these so we don't get conflicts later git rm -r cereal opendbc panda selfdrive/ui/ui > /dev/null git commit -m "removed conflicting files" > /dev/null # skip-smudge to get rid of some lfs errors that it can't find the reference of some lfs files # we don't care about fetching/pushing lfs right now git lfs install --skip-smudge --local # squash initial setup commits git cherry-pick -n -X theirs 6c33a5c..59b3d06 > /dev/null git commit -m "switching to master" > /dev/null # squash the two commits git reset --soft HEAD~2 git commit -m "switching to master" -m "$(git log --reverse --format=%B 6c33a5c..59b3d06)" -m "removed conflicting files" > /dev/null # get commits we want to cherry-pick # will start with the next commit after #59b3d06 tools is local now COMMITS=$(git rev-list --reverse 59b3d06..master) # we need this for logging TOTAL_COMMITS=$(echo $COMMITS | wc -w | xargs) CURRENT_COMMIT_NUMBER=0 # empty this file > commit-map.txt echo "Rewriting master commits..." for COMMIT in $COMMITS; do CURRENT_COMMIT_NUMBER=$((CURRENT_COMMIT_NUMBER + 1)) # echo -ne "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Cherry-picking commit: $COMMIT"\\r echo "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Cherry-picking commit: $COMMIT" # set environment variables to preserve author/committer and dates export GIT_AUTHOR_NAME=$(git show -s --format='%an' $COMMIT) export GIT_AUTHOR_EMAIL=$(git show -s --format='%ae' $COMMIT) export GIT_COMMITTER_NAME=$(git show -s --format='%cn' $COMMIT) export GIT_COMMITTER_EMAIL=$(git show -s --format='%ce' $COMMIT) export GIT_AUTHOR_DATE=$(git show -s --format='%ad' $COMMIT) export GIT_COMMITTER_DATE=$(git show -s --format='%cd' $COMMIT) # cherry-pick the commit if ! GIT_OUTPUT=$(git cherry-pick -m 1 -X theirs $COMMIT 2>&1); then # check if the failure is because of an empty commit if [[ "$GIT_OUTPUT" == *"The previous cherry-pick is now empty"* ]]; then echo "Empty commit detected. Skipping commit $COMMIT" git cherry-pick --skip # log it was empty to the mapping file echo "$COMMIT EMPTY" >> commit-map.txt else # handle other errors or conflicts echo "Cherry-pick failed. Handling error..." echo "$GIT_OUTPUT" exit 1 fi else # capture the new commit hash NEW_COMMIT=$(git rev-parse HEAD) # save the old and new commit hashes to the mapping file echo "$COMMIT $NEW_COMMIT" >> commit-map.txt # append the old commit ID to the commit message git commit --amend -m "$(git log -1 --pretty=%B)" -m "Former-commit-id: $COMMIT" > /dev/null fi # prune every 3000 commits to avoid gc errors if [ $((CURRENT_COMMIT_NUMBER % 3000)) -eq 0 ]; then echo "Pruning repo..." git gc fi done echo "Rewriting tags..." # remove all old tags git tag -l | xargs git tag -d # read each line from the tag-commit-map.txt while IFS=' ' read -r TAG OLD_COMMIT; do # search for the new commit in commit-map.txt corresponding to the old commit NEW_COMMIT=$(grep "^$OLD_COMMIT " "commit-map.txt" | awk '{print $2}') # check if this is a rebased commit if [ -z "$NEW_COMMIT" ]; then # if not, then just use old commit hash NEW_COMMIT=$OLD_COMMIT fi echo "Rewriting tag $TAG from commit $NEW_COMMIT" git tag -f "$TAG" "$NEW_COMMIT" done < "$DIR/tag-commit-map.txt" # uninstall lfs since we don't want to touch (push to) lfs right now # git push will also push lfs, if we don't uninstall (--local so just for this repo) git lfs uninstall --local # force push new master git push --force origin main:master # force push new tags git push --force --tags fi # REWRITE branches based on master if [ ! -f "$SRC_CLONE/rewrite-branches-done" ]; then cd $SRC_CLONE > rewrite-branches-done # empty file > $BRANCH_DIFF_LOG echo "Rewriting branches based on master..." # will store raw diffs here, if exist mkdir -p differences # get a list of all branches except master and REWRITE_IGNORE_BRANCHES BRANCHES=$(git branch -r | grep -v ' -> ' | sed 's/.*origin\///' | grep -v '^master$' | grep -v -f <(echo "${REWRITE_IGNORE_BRANCHES[*]}" | tr ' ' '\n')) for BRANCH in $BRANCHES; do # check if the branch is based on master history MERGE_BASE=$(git merge-base master origin/$BRANCH) || true if [ -n "$MERGE_BASE" ]; then echo "Rewriting branch: $BRANCH" # create a new branch based on the new master NEW_MERGE_BASE=$(grep "^$MERGE_BASE " "commit-map.txt" | awk '{print $2}') if [ -z "$NEW_MERGE_BASE" ]; then echo "Error: could not find new merge base for branch $BRANCH" >> $BRANCH_DIFF_LOG continue fi git checkout -b ${BRANCH}_new $NEW_MERGE_BASE # get the range of commits unique to this branch COMMITS=$(git rev-list --reverse $MERGE_BASE..origin/${BRANCH}) HAS_ERROR=0 # simple delimiter echo "BRANCH ${BRANCH}" >> commit-map.txt for COMMIT in $COMMITS; do # set environment variables to preserve author/committer and dates export GIT_AUTHOR_NAME=$(git show -s --format='%an' $COMMIT) export GIT_AUTHOR_EMAIL=$(git show -s --format='%ae' $COMMIT) export GIT_COMMITTER_NAME=$(git show -s --format='%cn' $COMMIT) export GIT_COMMITTER_EMAIL=$(git show -s --format='%ce' $COMMIT) export GIT_AUTHOR_DATE=$(git show -s --format='%ad' $COMMIT) export GIT_COMMITTER_DATE=$(git show -s --format='%cd' $COMMIT) # cherry-pick the commit if ! GIT_OUTPUT=$(git cherry-pick -m 1 -X theirs $COMMIT 2>&1); then # check if the failure is because of an empty commit if [[ "$GIT_OUTPUT" == *"The previous cherry-pick is now empty"* ]]; then echo "Empty commit detected. Skipping commit $COMMIT" git cherry-pick --skip # log it was empty to the mapping file echo "$COMMIT EMPTY" >> commit-map.txt else # handle other errors or conflicts echo "Cherry-pick of ${BRANCH} branch failed. Removing branch upstream..." >> $BRANCH_DIFF_LOG echo "$GIT_OUTPUT" > "$LOGS_DIR/branch-${BRANCH}" git cherry-pick --abort git push --delete origin ${BRANCH} HAS_ERROR=1 break fi else # capture the new commit hash NEW_COMMIT=$(git rev-parse HEAD) # save the old and new commit hashes to the mapping file echo "$COMMIT $NEW_COMMIT" >> commit-map.txt # append the old commit ID to the commit message git commit --amend -m "$(git log -1 --pretty=%B)" -m "Former-commit-id: $COMMIT" > /dev/null fi done # force push the new branch if [ $HAS_ERROR -eq 0 ]; then # git lfs goes haywire here, so we need to install and uninstall # git lfs install --skip-smudge --local git lfs uninstall --local > /dev/null git push -f origin ${BRANCH}_new:${BRANCH} fi # clean up local branch git checkout master > /dev/null git branch -D ${BRANCH}_new > /dev/null else echo "Deleting branch $BRANCH as it's not based on master history" >> $BRANCH_DIFF_LOG git push --delete origin ${BRANCH} fi done fi # VALIDATE cherry-pick if [ ! -f "$SRC_CLONE/validation-done" ]; then cd $SRC_CLONE > validation-done TOTAL_COMMITS=$(grep -cve '^\s*$' commit-map.txt) CURRENT_COMMIT_NUMBER=0 COUNT_SAME=0 COUNT_DIFF=0 # empty file > $COMMIT_DIFF_LOG echo "Validating commits..." # will store raw diffs here, if exist mkdir -p differences # read each line from commit-map.txt while IFS=' ' read -r OLD_COMMIT NEW_COMMIT; do if [ "$NEW_COMMIT" == "EMPTY" ]; then continue fi if [ "$OLD_COMMIT" == "BRANCH" ]; then echo "Branch ${NEW_COMMIT} below:" >> $COMMIT_DIFF_LOG continue fi CURRENT_COMMIT_NUMBER=$((CURRENT_COMMIT_NUMBER + 1)) # retrieve short hashes and dates for the old and new commits OLD_COMMIT_SHORT=$(git rev-parse --short $OLD_COMMIT) NEW_COMMIT_SHORT=$(git rev-parse --short $NEW_COMMIT) OLD_DATE=$(git show -s --format='%cd' $OLD_COMMIT) NEW_DATE=$(git show -s --format='%cd' $NEW_COMMIT) # echo -ne "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Comparing old commit $OLD_COMMIT_SHORT ($OLD_DATE) with new commit $NEW_COMMIT_SHORT ($NEW_DATE)"\\r echo "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Comparing old commit $OLD_COMMIT_SHORT ($OLD_DATE) with new commit $NEW_COMMIT_SHORT ($NEW_DATE)" # generate lists of files and their hashes for the old and new commits, excluding ignored files OLD_FILES=$(git ls-tree -r $OLD_COMMIT | grep -vE "$(IFS='|'; echo "${VALIDATE_IGNORE_FILES[*]}")") NEW_FILES=$(git ls-tree -r $NEW_COMMIT | grep -vE "$(IFS='|'; echo "${VALIDATE_IGNORE_FILES[*]}")") # Compare the diffs if diff <(echo "$OLD_FILES") <(echo "$NEW_FILES") > /dev/null; then # echo "Old commit $OLD_COMMIT_SHORT and new commit $NEW_COMMIT_SHORT are equivalent." COUNT_SAME=$((COUNT_SAME + 1)) else echo "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Difference found between old commit $OLD_COMMIT_SHORT and new commit $NEW_COMMIT_SHORT" >> $COMMIT_DIFF_LOG COUNT_DIFF=$((COUNT_DIFF + 1)) set +e diff -u <(echo "$OLD_FILES") <(echo "$NEW_FILES") > "$LOGS_DIR/commit-$CURRENT_COMMIT_NUMBER-$OLD_COMMIT_SHORT-$NEW_COMMIT_SHORT" set -e fi done < "commit-map.txt" echo "Summary:" >> $COMMIT_DIFF_LOG echo "Equivalent commits: $COUNT_SAME" >> $COMMIT_DIFF_LOG echo "Different commits: $COUNT_DIFF" >> $COMMIT_DIFF_LOG fi if [ ! -d $OUT ]; then cp -r $SRC $OUT cd $OUT # remove all non-master branches # git branch | grep -v "^ master$" | grep -v "\*" | xargs git branch -D # echo "cleaning up refs" # delete pull request refs since we can't alter them anyway (https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally#error-failed-to-push-some-refs) # git for-each-ref --format='%(refname)' | grep '^refs/pull/' | xargs -I {} git update-ref -d {} echo "importing new lfs files" # import "almost" everything to lfs BRANCHES=$(git for-each-ref --format='%(refname)' refs/heads/ | sed 's%refs/heads/%%g' | grep -v -f <(echo "${REWRITE_IGNORE_BRANCHES[*]}" | tr ' ' '\n') | tr '\n' ' ') git lfs migrate import --include="*.dlc,*.onnx,*.svg,*.png,*.gif,*.ttf,*.wav,selfdrive/car/tests/test_models_segs.txt,system/hardware/tici/updater,selfdrive/ui/qt/spinner_larch64,selfdrive/ui/qt/text_larch64,third_party/**/*.a,third_party/**/*.so,third_party/**/*.so.*,third_party/**/*.dylib,third_party/acados/*/t_renderer,third_party/qt5/larch64/bin/lrelease,third_party/qt5/larch64/bin/lupdate,third_party/catch2/include/catch2/catch.hpp,*.apk,*.apkpatch,*.jar,*.pdf,*.jpg,*.mp3,*.thneed,*.tar.gz,*.npy,*.csv,*.a,*.so*,*.dylib,*.o,*.b64,selfdrive/hardware/tici/updater,selfdrive/boardd/tests/test_boardd,selfdrive/ui/qt/spinner_aarch64,installer/updater/updater,selfdrive/debug/profiling/simpleperf/**/*,selfdrive/hardware/eon/updater,selfdrive/ui/qt/text_aarch64,selfdrive/debug/profiling/pyflame/**/*,installer/installers/installer_openpilot,installer/installers/installer_dashcam,selfdrive/ui/text/text,selfdrive/ui/android/text/text,selfdrive/ui/spinner/spinner,selfdrive/visiond/visiond,selfdrive/loggerd/loggerd,selfdrive/sensord/sensord,selfdrive/sensord/gpsd,selfdrive/ui/android/spinner/spinner,selfdrive/ui/qt/spinner,selfdrive/ui/qt/text,_stringdefs.py,dfu-util-aarch64-linux,dfu-util-aarch64,dfu-util-x86_64-linux,dfu-util-x86_64,stb_image.h,clpeak3,clwaste,apk/**/*,external/**/*,phonelibs/**/*,third_party/boringssl/**/*,flask/**/*,panda/**/*,board/**/*,messaging/**/*,opendbc/**/*,tools/cabana/chartswidget.cc,third_party/nanovg/**/*,selfdrive/controls/lib/lateral_mpc/lib_mpc_export/**/*,selfdrive/ui/paint.cc,werkzeug/**/*,pyextra/**/*,third_party/android_hardware_libhardware/**/*,selfdrive/controls/lib/lead_mpc_lib/lib_mpc_export/**/*,selfdrive/locationd/laikad.py,selfdrive/locationd/test/test_laikad.py,tools/gpstest/test_laikad.py,selfdrive/locationd/laikad_helpers.py,tools/nui/**/*,jsonrpc/**/*,selfdrive/controls/lib/longitudinal_mpc/lib_mpc_export/**/*,selfdrive/controls/lib/lateral_mpc/mpc_export/**/*,selfdrive/camerad/cameras/camera_qcom.cc,selfdrive/manager.py,selfdrive/modeld/models/driving.cc,third_party/curl/**/*,selfdrive/modeld/thneed/debug/**/*,selfdrive/modeld/thneed/include/**/*,third_party/openmax/**/*,selfdrive/controls/lib/longitudinal_mpc/mpc_export/**/*,selfdrive/controls/lib/longitudinal_mpc_model/lib_mpc_export/**/*,Pipfile,Pipfile.lock,gunicorn/**/*,*.qm,jinja2/**/*,click/**/*,dbcs/**/*,websocket/**/*" $BRANCHES echo "reflog and gc" # this is needed after lfs import git reflog expire --expire=now --all git gc --prune=now --aggressive # check the git-filter-repo analysis again - can be found in the repo root/filter-repo/analysis echo "Analyzing with git-filter-repo..." /tmp/git-filter-repo --force --analyze echo "New size is $(du -sh .)" fi cd $OUT # fetch all lfs files from https://github.com/commaai/openpilot.git # some lfs files are missing on gitlab, but they can be found on github git config lfs.url https://github.com/commaai/openpilot.git/info/lfs git config lfs.pushurl ssh://git@github.com/commaai/openpilot.git git lfs fetch --all || true # also fetch all lfs files from https://gitlab.com/commaai/openpilot-lfs.git git config lfs.url https://gitlab.com/commaai/openpilot-lfs.git/info/lfs git config lfs.pushurl ssh://git@gitlab.com/commaai/openpilot-lfs.git git lfs fetch --all || true # final push - will also push lfs # TODO: switch to git@github.com:commaai/openpilot.git when ready # git push --mirror git@github.com:commaai/openpilot-tiny.git # using this instead to ignore refs/pull/* - since this is also what --mirror does - https://blog.plataformatec.com.br/2013/05/how-to-properly-mirror-a-git-repository/ git push --prune git@github.com:commaai/openpilot-tiny.git +refs/heads/*:refs/heads/* +refs/tags/*:refs/tags/*