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

benedikt-schesch · Sep 2, 2024 · b5d8e3e · b5d8e3e
2 parents e4f1e5c + 3f8a581
commit b5d8e3e
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 33 deletions.
diff --git a/src/scripts/merge_tools/gitmerge.sh b/src/scripts/merge_tools/gitmerge.sh
@@ -1,23 +1,23 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge.sh <clone_dir> <branch-1> <branch-2> <strategy>
+# usage: ./gitmerge.sh <clone_dir> <branch-1> <branch-2> <git_strategy>
 # <clone_dir> must contain a clone of a repository.
-# <strategy> is arguments to `git merge`, including -s and possibly -X.
-# Merges branch2 into branch1, in <clone_dir>, using merge strategy <strategy>.
+# <git_strategy> is arguments to `git merge`, including -s and possibly -X.
+# Merges branch2 into branch1, in <clone_dir>, using merge strategy <git_strategy>.
 # Return code is 0 for merge success, 1 for merge failure.
 # For merge failure, also outputs "Conflict" and aborts the merge.
 
 set -o nounset
 
 if [ "$#" -ne 4 ]; then
-  echo "Usage: $0 CLONE_DIR BRANCH1 BRANCH2 STRATEGY" >&2
+  echo "Usage: $0 CLONE_DIR BRANCH1 BRANCH2 GIT_STRATEGY" >&2
   exit 1
 fi
 
 clone_dir=$1
 branch1=$2
 branch2=$3
-strategy=$4
+git_strategy=$4
 
 ## Perform merge
 
@@ -26,14 +26,14 @@ cd "$clone_dir" || (echo "$0: cannot cd to $clone_dir" ; exit 1)
 git checkout "$branch1" --force
 git config merge.conflictstyle zdiff3
 
-echo "Running: git merge --no-edit $strategy $branch2"
+echo "Running: git merge --no-edit $git_strategy $branch2"
 # shellcheck disable=SC2086
-git merge --no-edit $strategy "$branch2"
+git merge --no-edit $git_strategy "$branch2"
 retVal=$?
 
 # report conflicts
 if [ $retVal -ne 0 ]; then
-    echo "gitmerge.sh: Conflict after running: git merge --no-edit $strategy $branch2"
+    echo "gitmerge.sh: Conflict after running: git merge --no-edit $git_strategy $branch2"
 fi
 
 exit $retVal
diff --git a/src/scripts/merge_tools/gitmerge_ort.sh b/src/scripts/merge_tools/gitmerge_ort.sh
@@ -6,5 +6,5 @@ MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
-strategy="-s ort"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+git_strategy="-s ort"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy"
diff --git a/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh b/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh
@@ -6,5 +6,5 @@ MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
-strategy="-s ort -Xignore-space-change"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+git_strategy="-s ort -Xignore-space-change"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy"
diff --git a/src/scripts/merge_tools/gitmerge_recursive_histogram.sh b/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
@@ -6,5 +6,5 @@ MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
-strategy="-s recursive -Xdiff-algorithm=histogram"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+git_strategy="-s recursive -Xdiff-algorithm=histogram"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy"
diff --git a/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh b/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh
@@ -6,5 +6,5 @@ MERGE_DIR="$(dirname "$0")"
 clone_dir=$1
 branch1=$2
 branch2=$3
-strategy="-s recursive -Xignore-space-change"
-"$MERGE_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+git_strategy="-s recursive -Xignore-space-change"
+"$MERGE_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy"
diff --git a/src/scripts/merge_tools/gitmerge_recursive_minimal.sh b/src/scripts/merge_tools/gitmerge_recursive_minimal.sh
@@ -6,5 +6,5 @@ MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
-strategy="-s recursive -Xdiff-algorithm=minimal"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+git_strategy="-s recursive -Xdiff-algorithm=minimal"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy"
diff --git a/src/scripts/merge_tools/gitmerge_recursive_myers.sh b/src/scripts/merge_tools/gitmerge_recursive_myers.sh
@@ -6,5 +6,5 @@ MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
-strategy="-s recursive -Xdiff-algorithm=myers"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+git_strategy="-s recursive -Xdiff-algorithm=myers"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy"
diff --git a/src/scripts/merge_tools/gitmerge_recursive_patience.sh b/src/scripts/merge_tools/gitmerge_recursive_patience.sh
@@ -6,5 +6,5 @@ MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
-strategy="-s recursive -Xdiff-algorithm=patience"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+git_strategy="-s recursive -Xdiff-algorithm=patience"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy"
diff --git a/src/scripts/merge_tools/gitmerge_resolve.sh b/src/scripts/merge_tools/gitmerge_resolve.sh
@@ -6,8 +6,8 @@ MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
-strategy="-s resolve"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+git_strategy="-s resolve"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy"
 status=$?
 
 if [ "$status" -ne 0 ]; then

diff --git a/src/scripts/merge_tools/merge_plumelib.sh b/src/scripts/merge_tools/merge_plumelib.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_imports_ignorespace.sh <clone_dir> <branch-1> <branch-2> <git_strategy> <merge_strategy>
+# usage: ./merge_plumelib.sh <clone_dir> <branch-1> <branch-2> <git_strategy> <merge_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.

diff --git a/src/scripts/merge_tools/plumelib_ort.sh b/src/scripts/merge_tools/plumelib_ort.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_plumelib.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./plumelib_ort.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

diff --git a/src/scripts/merge_tools/plumelib_ort_adjacent.sh b/src/scripts/merge_tools/plumelib_ort_adjacent.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_adjacent.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./plumelib_ort_adjacent.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

diff --git a/src/scripts/merge_tools/plumelib_ort_adjacent_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_adjacent_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_adjacent_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./plumelib_ort_adjacent_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

diff --git a/src/scripts/merge_tools/plumelib_ort_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_plumelib_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./plumelib_ort_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

diff --git a/src/scripts/merge_tools/plumelib_ort_imports.sh b/src/scripts/merge_tools/plumelib_ort_imports.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_imports.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./plumelib_ort_imports.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

diff --git a/src/scripts/merge_tools/plumelib_ort_imports_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_imports_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_imports_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./plumelib_ort_imports_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

diff --git a/src/scripts/merge_tools/plumelib_ort_version_number.sh b/src/scripts/merge_tools/plumelib_ort_version_number.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_version_number.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./plumelib_ort_version_number.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

diff --git a/src/scripts/merge_tools/plumelib_ort_version_number_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_version_number_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_version_number_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./plumelib_ort_version_number_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1