Adjacent plus plumelib plus app pre9

.github/workflows/check-style.yml

@@ -25,3 +25,5 @@ jobs:
       run: sudo apt update && sudo apt install shellcheck devscripts
     - name: Check style
       run: make check-style
+    - name: Check script diffs
+      run: pwd && cd src/scripts/merge_tools && pwd && ls && ./check-implementations.sh

Makefile

@@ -1,4 +1,4 @@
-all: style gradle-assemble
+all: check-style gradle-assemble
 
 fix-style: fix-python-style fix-java-style
 

src/python/replay_merge.py

@@ -14,6 +14,7 @@
 import argparse
 import git
 import os
+import os.path
 import sys
 import tarfile
 from pathlib import Path
@@ -93,7 +94,22 @@ def merge_replay(
     plumelib_merging_dir = Path(ast_merging_evaluation_repo.working_tree_dir) / Path(
         "src/scripts/merge_tools/merging"
     )
-    subprocess.run(["./gradlew", "-q", "shadowJar"], cwd=plumelib_merging_dir)
+    print(f"About to compile in {plumelib_merging_dir}")
+    p = subprocess.run(
+        ["./gradlew", "-q", "shadowJar"],
+        cwd=plumelib_merging_dir,
+        capture_output=True,
+        text=True,
+    )
+    if p.returncode != 0:
+        print("Failure in: ./gradlew -q shadowJar")
+        print(p.stdout)
+        print(p.stderr)
+        sys.exit(1)
+    p = subprocess.run(
+        ["./gradlew", "-q", "nativeCompile"], cwd=plumelib_merging_dir, check=False
+    )
+    print("Finished compiling")
 
     result_df = pd.DataFrame()
     with Progress(
@@ -158,6 +174,7 @@ def merge_replay(
                     ["git", "merge-base", merge_data["left"], merge_data["right"]],
                     cwd=repo.local_repo_path,
                     stdout=subprocess.PIPE,
+                    check=True,
                 )
                 .stdout.decode("utf-8")
                 .strip()

src/python/repo.py

@@ -109,10 +109,11 @@ def clone_repo(repo_slug: str, repo_dir: Path) -> None:
 MERGE_TOOL = Enum(
     "MERGE_TOOL",
     [
+        ## First, the algorithms that the paper evaluates.
         "gitmerge_ort",
         "gitmerge_ort_ignorespace",
         "gitmerge_recursive_histogram",
-        "gitmerge_recursive_ignorespace",
+        "gitmerge_recursive_myers_ignorespace",
         "gitmerge_recursive_minimal",
         "gitmerge_recursive_myers",
         "gitmerge_recursive_patience",
@@ -123,17 +124,26 @@ def clone_repo(repo_slug: str, repo_dir: Path) -> None:
         "adjacent",
         "imports",
         "version_numbers",
-        "git_hires_merge_plus",
-        "intellimerge_plus",
+        "ivn",
+        "ivn_ignorespace",
+        ## Second, the algorithms that we run to correct the classifications of the above algorithms.
+        ## "_plus" = plus known good = plus default plumelib == + imports + version_numbers
+        "gitmerge_ort_plus",
+        "gitmerge_ort_ignorespace_plus",
         "gitmerge_recursive_histogram_plus",
-        "gitmerge_recursive_ignorespace_plus",
+        "gitmerge_recursive_myers_ignorespace_plus",
         "gitmerge_recursive_minimal_plus",
         "gitmerge_recursive_myers_plus",
         "gitmerge_recursive_patience_plus",
         "gitmerge_resolve_plus",
+        "git_hires_merge_plus",
         "spork_plus",
-        "ivn",
-        "ivn_ignorespace",
+        "intellimerge_plus",
+        "adjacent_plus",
+        "imports_plus",
+        "version_numbers_plus",
+        "ivn_plus",
+        "ivn_ignorespace_plus",
     ],
 )
 MERGE_STATE = Enum(

src/scripts/merge_tools/adjacent_ignorespace_plus.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s ort -Xignore-space-change"
+plumelib_strategy="--adjacent"
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/adjacent_plus.sh

@@ -7,7 +7,5 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 git_strategy="-s ort"
-# Uses both --adjacent and all of plume-lib merging's default behaviors.
-# Thus, this implements "adjacent + plume-lib-merging-fixups".
 plumelib_strategy="--adjacent"
 "$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/check-implementations.sh

@@ -0,0 +1,63 @@
+#!/bin/sh
+
+# This checks that the implementations of various tools are consistent with one another.
+
+set -e
+
+# Check for identical content.
+
+diff -q ivn_plus.sh adjacent_plus.sh > /dev/null 2>&1 && { echo "identical: ivn_plus.sh adjacent_plus.sh"; exit 1; }
+diff -q ivn_plus.sh gitmerge_ort_plus.sh
+diff -q ivn_plus.sh imports_plus.sh
+diff -q ivn_plus.sh version_numbers_plus.sh
+
+diff -q ivn_ignorespace_plus.sh adjacent_ignorespace_plus.sh > /dev/null 2>&1 && { echo "identical: ivn_ignorespace_plus.sh adjacent_ignorespace_plus.sh"; exit 1; }
+diff -q ivn_ignorespace_plus.sh gitmerge_ort_ignorespace_plus.sh
+diff -q ivn_ignorespace_plus.sh imports_ignorespace_plus.sh
+diff -q ivn_ignorespace_plus.sh version_numbers_ignorespace_plus.sh
+
+# 
+
+
+## These have an ignorespace version
+
+tmpfile=$(mktemp)
+tmpfile2=$(mktemp)
+
+for base in adjacent imports ivn version_numbers ; do
+    diff "$base.sh" "${base}_ignorespace.sh" > "$tmpfile" || true
+    diff -q diff-pl-ignorespace.diff "$tmpfile" || { echo "problem with: diff $base.sh ${base}_ignorespace.sh" ; exit 1; }
+    diff "${base}_plus.sh" "${base}_ignorespace_plus.sh" > "$tmpfile" || true
+    diff -q diff-pl-ignorespace.diff "$tmpfile" || { echo "problem with: diff ${base}_plus.sh ${base}_ignorespace_plus.sh" ; exit 1; }
+
+    diff "$base.sh" "${base}_plus.sh" > "$tmpfile" || true
+    diff "${base}_ignorespace.sh" "${base}_ignorespace_plus.sh" > "$tmpfile2" || true
+    diff -q "$tmpfile" "$tmpfile2" || { echo "problem with: ( $base.sh ${base}_plus.sh) versus ( ${base}_ignorespace.sh ${base}_ignorespace_plus.sh"; exit 1; }
+done
+
+
+for base in gitmerge_ort gitmerge_recursive_myers ; do
+    diff "$base.sh" "${base}_ignorespace.sh" > "$tmpfile" || true
+    diff "${base}_plus.sh" "${base}_ignorespace_plus.sh" > "$tmpfile2" || true
+    diff -q "$tmpfile" "$tmpfile2" || { echo "problem with: ( $base.sh ${base}_ignorespace.sh) versus ( ${base}_plus.sh ${base}_ignorespace_plus.sh"; exit 1; }
+
+
+    diff "$base.sh" "${base}_plus.sh" > "$tmpfile" || true
+    diff "${base}_ignorespace.sh" "${base}_ignorespace_plus.sh" > "$tmpfile2" || true
+    diff -q "$tmpfile" "$tmpfile2" || { echo "problem with: ( $base.sh ${base}_plus.sh) versus ( ${base}_ignorespace.sh ${base}_ignorespace_plus.sh"; exit 1; }
+done
+
+
+## These do not have an ignorespace version
+
+# "git_hires_merge.sh" has different diffs, so it is not included.
+# TODO: Reinstate  gitmerge_resolve
+for base in gitmerge_recursive_histogram gitmerge_recursive_minimal \
+            gitmerge_recursive_patience ; do
+
+    diff "$base.sh" "${base}_plus.sh" > "$tmpfile" || true
+    diff -q diff-gm-plus.diff "$tmpfile" || { echo "problem with $base.sh ${base}_plus.sh"; exit 1; }
+
+done
+
+rm -rf "$tmpfile"

src/scripts/merge_tools/diff-gm-ignorespace.diff

@@ -0,0 +1,5 @@
+10c10,11
+< "$MERGE_SCRIPTS_DIR"/gitmerge.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/diff-gm-plus.diff

@@ -0,0 +1,5 @@
+10c10,11
+< "$MERGE_SCRIPTS_DIR"/gitmerge.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/diff-gmpl-ignorespace.diff

@@ -0,0 +1,4 @@
+9c9
+< git_strategy="-s ort"
+---
+> git_strategy="-s ort -Xignore-space-change"

src/scripts/merge_tools/diff-pl-ignorespace.diff

@@ -0,0 +1,4 @@
+9c9
+< git_strategy="-s ort"
+---
+> git_strategy="-s ort -Xignore-space-change"

src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh → src/scripts/merge_tools/gitmerge_ort_ignorespace_plus.sh

@@ -6,6 +6,6 @@ MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
-git_strategy="-s recursive -Xignore-space-change"
+git_strategy="-s ort -Xignore-space-change"
 plumelib_strategy=""
 "$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/gitmerge_ort_plus.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s ort"
+plumelib_strategy=""
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/gitmerge_recursive_myers_ignorespace.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s recursive -Xdiff-algorithm=myers -Xignore-space-change"
+"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy"

src/scripts/merge_tools/gitmerge_recursive_myers_ignorespace_plus.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s recursive -Xdiff-algorithm=myers -Xignore-space-change"
+plumelib_strategy=""
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/imports_ignorespace_plus.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s ort -Xignore-space-change"
+plumelib_strategy=""
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/imports_plus.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s ort"
+plumelib_strategy=""
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/ivn_ignorespace_plus.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s ort -Xignore-space-change"
+plumelib_strategy=""
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/ivn_plus.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s ort"
+plumelib_strategy=""
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/merge_git_then_plumelib.sh

@@ -57,7 +57,7 @@ fi
 
 git config --local merge.tool merge-plumelib
 # shellcheck disable=SC2016
-git config --local mergetool.merge-plumelib.cmd "$SCRIPTDIR"/'java-merge-tool.sh '"$plumelib_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}'
+git config --local mergetool.merge-plumelib.cmd "$SCRIPTDIR"/'java-merge-tool.sh '"$plumelib_strategy"' ${LOCAL} ${BASE} ${REMOTE} ${MERGED}'
 git config --local mergetool.merge-plumelib.trustExitCode true
 
 case "$plumelib_strategy" in
@@ -73,10 +73,10 @@ esac
 
 if [ -n "$VERBOSE" ] ; then
   echo "$0: about to run: git-mergetool.sh $all_arg --tool=merge-plumelib in $(pwd)"
-fi
-git-mergetool.sh $all_arg --tool=merge-plumelib
-if [ -n "$VERBOSE" ] ; then
+  git-mergetool.sh --verbose $all_arg --tool=merge-plumelib
   echo "$0: ran: git-mergetool.sh $all_arg --tool=merge-plumelib in $(pwd)"
+else
+  git-mergetool.sh $all_arg --tool=merge-plumelib
 fi
 
 # Check if there are still conflicts

src/scripts/merge_tools/merge_script_then_plumelib.sh

@@ -58,7 +58,7 @@ fi
 
 git config --local merge.tool merge-plumelib
 # shellcheck disable=SC2016
-git config --local mergetool.merge-plumelib.cmd "$SCRIPTDIR"/'java-merge-tool.sh '"$plumelib_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}'
+git config --local mergetool.merge-plumelib.cmd "$SCRIPTDIR"/'java-merge-tool.sh '"$plumelib_strategy"' ${LOCAL} ${BASE} ${REMOTE} ${MERGED}'
 git config --local mergetool.merge-plumelib.trustExitCode true
 
 case "$plumelib_strategy" in

src/scripts/merge_tools/version_numbers_ignorespace_plus.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s ort -Xignore-space-change"
+plumelib_strategy=""
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"

src/scripts/merge_tools/version_numbers_plus.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
+
+MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+clone_dir=$1
+branch1=$2
+branch2=$3
+git_strategy="-s ort"
+plumelib_strategy=""
+"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"