Merge ../AST-Merging-Evaluation-branch-main into check-usage

src/scripts/merge_tools/gitmerge.sh

@@ -24,7 +24,8 @@ git_strategy=$4
 cd "$clone_dir" || (echo "$0: cannot cd to $clone_dir" ; exit 1)
 
 git checkout "$branch1" --force
-git config merge.conflictstyle zdiff3
+git config --local merge.conflictstyle zdiff3
+git config --local mergetool.prompt false
 
 echo "Running: git merge --no-edit $git_strategy $branch2"
 # shellcheck disable=SC2086

src/scripts/merge_tools/merge_plumelib.sh → src/scripts/merge_tools/merge_git_then_plumelib.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./merge_plumelib.sh <clone_dir> <branch-1> <branch-2> <git_strategy> <merge_strategy>
+# usage: ./merge_git_then_plumelib.sh <clone_dir> <branch-1> <branch-2> <git_strategy> <plumelib_strategy>
 # First runs `git merge`, then runs Plume-lib Merging to improve the result of `git merge`.
 # <clone_dir> must contain a clone of a repository.
 # Return code is 0 for merge success, 1 for merge failure, 2 for script failure.
@@ -17,11 +17,11 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 git_strategy=$4 #"-Xignore-space-change"
-merge_strategy=$5 #"--only-adjacent"
+plumelib_strategy=$5 #"--only-adjacent"
 
 ## Perform merge
 
-echo "$0: Merging $branch1 and $branch2 with git_strategy=$git_strategy and merge_strategy=$merge_strategy"
+echo "$0: Merging $branch1 and $branch2 with git_strategy=$git_strategy and plumelib_strategy=$plumelib_strategy"
 
 cd "$clone_dir" || (echo "$0: cannot cd to $clone_dir" ; exit 1)
 
@@ -31,15 +31,15 @@ git config --local merge.conflictstyle diff3
 git config --local mergetool.prompt false
 git config --local merge.tool merge-plumelib
 # shellcheck disable=SC2016
-git config --local mergetool.merge-plumelib.cmd 'java-merge-tool.sh '"$merge_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}'
+git config --local mergetool.merge-plumelib.cmd 'java-merge-tool.sh '"$plumelib_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}'
 git config --local mergetool.merge-plumelib.trustExitCode true
 
 # shellcheck disable=SC2086
 git merge --no-edit $git_strategy "$branch2"
 
 ## Now, run Plume-lib Merging to improve the result of `git merge`.
 
-case "$merge_strategy" in
+case "$plumelib_strategy" in
     *"--no-imports"* | *"--only-adjacent"* | *"--only-annotations"* | *"--only-version-numbers"*)
         # The "imports" merger is not being used, so don't use the "--all" command-line option.
         all_arg=""

src/scripts/merge_tools/plumelib_ort.sh

@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort"
 plumelib_strategy=""
-"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/plumelib_ort_adjacent.sh

@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort"
 plumelib_strategy="--only-adjacent"
-"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/plumelib_ort_adjacent_ignorespace.sh

@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort -Xignore-space-change"
 plumelib_strategy="--only-adjacent"
-"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/plumelib_ort_ignorespace.sh

@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort -Xignore-space-change"
 plumelib_strategy=""
-"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/plumelib_ort_imports.sh

@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort"
 plumelib_strategy="--only-imports"
-"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/plumelib_ort_imports_ignorespace.sh

@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort -Xignore-space-change"
 plumelib_strategy="--only-imports"
-"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/plumelib_ort_version_number.sh

@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort"
 plumelib_strategy="--only-version-numbers"
-"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/plumelib_ort_version_number_ignorespace.sh

@@ -8,4 +8,4 @@ branch1=$2
 branch2=$3
 git_strategy="-s ort -Xignore-space-change"
 plumelib_strategy="--only-version-numbers"
-"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"