Simplified scripts for copying to jb-main

scripts/snap/Readme.txt

@@ -0,0 +1,7 @@
+The purposes of these scripts is to merge some subfolder to jb-main branch from other branch (usually it is "integration" or "integration-release/something").
+
+The HEAD should be on the commit which you want to merge.
+
+It creates 2 branches:
+- integration-snap/$hash/to-jb-main - should be merged to jb-main. It is created from the merging currentCommit to merge-base(currentCommit, jb-main)
+- integration-snap/$hash/to-integration - should be merged to integration, to avoid conflicts in future merges of jb-main. It is createad as "empty" merge of "to-jb-main" to merge-base(currentCommit, integration)

scripts/mergeEmpty.sh → scripts/snap/impl/mergeEmpty.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+## !!! Be careful using this script separately from the main scripts in the parent folder
+##
 ## This script merges a commit with discarding all the changes in it.
 ## It is useful when you don't want to merge some changes, but want to change a base commit, solving all future conflicts.
 
@@ -12,7 +14,7 @@ fi
 
 COMMIT=$1
 
-ROOT_DIR="$(dirname "$0")/.."
+ROOT_DIR="$(dirname "$0")/../../.."
 
 (
     cd $ROOT_DIR; 

scripts/snap/impl/snapSubfolder.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+## !!! Be careful using this script separately from the main scripts in the parent folder
+##
+## This script set the state of a subfolder to the state in some commit, creating a merge commit.
+## Warning!!! Snapping subfolders breaks the base commit and future merges of the destination branch. To fix it, merge the destination branch back to the source branch, discarding all changes.
+
+set -e
+
+if [ -z "$1" ]; then
+echo "Specify the snapping commit and the subfolders. For example: ./snapSubfolder.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'"
+exit 1
+fi
+
+if [ -z "$2" ]; then
+echo "Specify the snapping commit and the subfolders. For example: ./snapSubfolder.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'"
+exit 1
+fi
+
+COMMIT=$1
+FIRST_FOLDER=$2
+ALL_FOLDERS=${@:2}
+
+ROOT_DIR="$(dirname "$0")/../../.."
+
+(
+    cd $ROOT_DIR;
+    git checkout --no-overlay $COMMIT -- $ALL_FOLDERS;
+    NEW_COMMIT=$(git commit-tree -p HEAD -p $COMMIT -m"Snap $COMMIT, subfolder $FIRST_FOLDER" $(git write-tree));
+    git reset --hard $NEW_COMMIT;
+)

scripts/snap/impl/snapToJbMain.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+if [ -z "$1" ]; then
+echo "Specify the snapping subfolder. For example: ./snapToJbMain.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'"
+exit 1
+fi
+
+DIR=$(dirname "$0")
+ALL_FOLDERS=${@:1}
+CURRENT_COMMIT=$(git rev-parse --short @)
+BRANCH_TO_RESTORE_IN_THE_END=$(git branch --show-current)
+
+
+TO_JB_MAIN_BRANCH=integration-snap/$CURRENT_COMMIT/to-jb-main
+git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/jb-main) -B $TO_JB_MAIN_BRANCH
+$DIR/snapSubfolder.sh $CURRENT_COMMIT $ALL_FOLDERS
+echo "Created $TO_JB_MAIN_BRANCH"
+
+TO_INTEGRATION_BRANCH=integration-snap/$CURRENT_COMMIT/to-integration
+git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/integration) -B $TO_INTEGRATION_BRANCH
+$DIR/mergeEmpty.sh $TO_JB_MAIN_BRANCH
+echo "Created $TO_INTEGRATION_BRANCH"
+
+
+git checkout --quiet $BRANCH_TO_RESTORE_IN_THE_END

scripts/snap/snapAnnotation.sh

@@ -0,0 +1 @@
+$(dirname "$0")/impl/snapToJbMain.sh 'compose/annotation'

scripts/snap/snapCollection.sh

@@ -0,0 +1 @@
+$(dirname "$0")/impl/snapToJbMain.sh 'compose/collection'

scripts/snap/snapCompose.sh

@@ -0,0 +1 @@
+$(dirname "$0")/impl/snapToJbMain.sh 'compose' ':(exclude)compose/material3'

scripts/snap/snapComposeMaterial3.sh

@@ -0,0 +1 @@
+$(dirname "$0")/impl/snapToJbMain.sh 'compose/material3'

scripts/snap/snapLifecycle.sh

@@ -0,0 +1 @@
+$(dirname "$0")/impl/snapToJbMain.sh 'compose/lifecycle'

scripts/snap/snapMaterial3.sh

@@ -0,0 +1 @@
+$(dirname "$0")/impl/snapToJbMain.sh 'compose/material3'

scripts/snap/snapNavigation.sh

@@ -0,0 +1 @@
+$(dirname "$0")/impl/snapToJbMain.sh 'compose/navigation'

scripts/snap/snapSavedstate.sh

@@ -0,0 +1 @@
+$(dirname "$0")/impl/snapToJbMain.sh 'compose/savedstate'