From 1f54b8defea7a4fb704e927b774c00f486de6346 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 12:28:11 -0700 Subject: [PATCH 01/20] Better diagnostic output --- test/check_equal_csv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/check_equal_csv.py b/test/check_equal_csv.py index 167ca28941..0fe1c05493 100755 --- a/test/check_equal_csv.py +++ b/test/check_equal_csv.py @@ -63,7 +63,7 @@ def remove_run_time(df): print(actual_df[col]) different_columns.append(col) print( - f"{goal_file} and {actual_file} are not equal in columns: {different_columns}" + f"{goal_folder / goal_file} and {actual_file} are not equal in columns: {different_columns}" ) # Print the differences print( From e8b922ec750d7e163d31e21689c6adbd7ab32675 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 12:37:28 -0700 Subject: [PATCH 02/20] Fail early if checkout does not succeed --- src/python/merge_analyzer.py | 43 ++++++++++++++---------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/src/python/merge_analyzer.py b/src/python/merge_analyzer.py index 42f7d1d6aa..11f4be857d 100755 --- a/src/python/merge_analyzer.py +++ b/src/python/merge_analyzer.py @@ -63,6 +63,11 @@ def merge_analyzer( # pylint: disable=too-many-locals left_success, _ = repo_left.checkout(merge_data["left"]) right_success, _ = repo_right.checkout(merge_data["right"]) + if not left_success: + raise Exception("git checkout failed: ", repo_left, merge_data["left"]) + if not right_success: + raise Exception("git checkout failed: ", repo_right, merge_data["right"]) + # Compute diff size in lines between left and right assert repo_left.repo_path.exists() assert repo_right.repo_path.exists() @@ -90,34 +95,20 @@ def merge_analyzer( # pylint: disable=too-many-locals cache_data["diff_contains_java_file"] = contains_java_file # Test left parent - if not left_success: - cache_data["left parent test result"] = TEST_STATE.Git_checkout_failed.name - cache_data["left_tree_fingerprint"] = None - cache_data["left parent test coverage"] = None - cache_data["parents pass"] = False - else: - cache_data["left_tree_fingerprint"] = repo_left.compute_tree_fingerprint() - result, test_coverage = repo_left.test(TIMEOUT_TESTING_PARENT, N_TESTS) - cache_data["left parent test result"] = result.name - cache_data["left parent test coverage"] = test_coverage - cache_data["parents pass"] = is_test_passed( - cache_data["left parent test result"] - ) + cache_data["left_tree_fingerprint"] = repo_left.compute_tree_fingerprint() + result, test_coverage = repo_left.test(TIMEOUT_TESTING_PARENT, N_TESTS) + cache_data["left parent test result"] = result.name + cache_data["left parent test coverage"] = test_coverage + cache_data["parents pass"] = is_test_passed(cache_data["left parent test result"]) # Test right parent - if not right_success: - cache_data["right parent test result"] = TEST_STATE.Git_checkout_failed.name - cache_data["right_tree_fingerprint"] = None - cache_data["right parent test coverage"] = None - cache_data["parents pass"] = False - else: - cache_data["right_tree_fingerprint"] = repo_right.compute_tree_fingerprint() - result, test_coverage = repo_right.test(TIMEOUT_TESTING_PARENT, N_TESTS) - cache_data["right parent test result"] = result.name - cache_data["right parent test coverage"] = test_coverage - cache_data["parents pass"] = cache_data["parents pass"] and is_test_passed( - cache_data["right parent test result"] - ) + cache_data["right_tree_fingerprint"] = repo_right.compute_tree_fingerprint() + result, test_coverage = repo_right.test(TIMEOUT_TESTING_PARENT, N_TESTS) + cache_data["right parent test result"] = result.name + cache_data["right parent test coverage"] = test_coverage + cache_data["parents pass"] = cache_data["parents pass"] and is_test_passed( + cache_data["right parent test result"] + ) cache_data["test merge"] = ( cache_data["parents pass"] From d10a6e6cf7d7ae715be560a409e71db99abe3b35 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 12:47:46 -0700 Subject: [PATCH 03/20] Show directory --- src/python/merge_analyzer.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/python/merge_analyzer.py b/src/python/merge_analyzer.py index 11f4be857d..77da0baeab 100755 --- a/src/python/merge_analyzer.py +++ b/src/python/merge_analyzer.py @@ -64,9 +64,13 @@ def merge_analyzer( # pylint: disable=too-many-locals right_success, _ = repo_right.checkout(merge_data["right"]) if not left_success: - raise Exception("git checkout failed: ", repo_left, merge_data["left"]) + raise Exception( + "git checkout failed: ", repo_left.repo_path, merge_data["left"] + ) if not right_success: - raise Exception("git checkout failed: ", repo_right, merge_data["right"]) + raise Exception( + "git checkout failed: ", repo_right.repo_path, merge_data["right"] + ) # Compute diff size in lines between left and right assert repo_left.repo_path.exists() From 02f3acf65930bf200543c56728ecc488bc72415e Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 12:50:40 -0700 Subject: [PATCH 04/20] Break line --- test/check_equal_csv.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/check_equal_csv.py b/test/check_equal_csv.py index 0fe1c05493..1d1840d485 100755 --- a/test/check_equal_csv.py +++ b/test/check_equal_csv.py @@ -63,7 +63,8 @@ def remove_run_time(df): print(actual_df[col]) different_columns.append(col) print( - f"{goal_folder / goal_file} and {actual_file} are not equal in columns: {different_columns}" + f"{goal_folder / goal_file} and {actual_file} are not equal in columns:" + + f" {different_columns}" ) # Print the differences print( From a5099bf52abcf6fb1930e6f33c72f22b1591be34 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 17:10:02 -0700 Subject: [PATCH 05/20] Undo change, perform fetch --- src/python/merge_analyzer.py | 49 +++++++++++++++++++-------------- src/python/write_head_hashes.py | 1 + 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/python/merge_analyzer.py b/src/python/merge_analyzer.py index 77da0baeab..37d26975f5 100755 --- a/src/python/merge_analyzer.py +++ b/src/python/merge_analyzer.py @@ -63,15 +63,6 @@ def merge_analyzer( # pylint: disable=too-many-locals left_success, _ = repo_left.checkout(merge_data["left"]) right_success, _ = repo_right.checkout(merge_data["right"]) - if not left_success: - raise Exception( - "git checkout failed: ", repo_left.repo_path, merge_data["left"] - ) - if not right_success: - raise Exception( - "git checkout failed: ", repo_right.repo_path, merge_data["right"] - ) - # Compute diff size in lines between left and right assert repo_left.repo_path.exists() assert repo_right.repo_path.exists() @@ -99,20 +90,36 @@ def merge_analyzer( # pylint: disable=too-many-locals cache_data["diff_contains_java_file"] = contains_java_file # Test left parent - cache_data["left_tree_fingerprint"] = repo_left.compute_tree_fingerprint() - result, test_coverage = repo_left.test(TIMEOUT_TESTING_PARENT, N_TESTS) - cache_data["left parent test result"] = result.name - cache_data["left parent test coverage"] = test_coverage - cache_data["parents pass"] = is_test_passed(cache_data["left parent test result"]) + if not left_success: + # This should never happen. Search output for "Git_checkout_failed" + cache_data["left parent test result"] = TEST_STATE.Git_checkout_failed.name + cache_data["left_tree_fingerprint"] = None + cache_data["left parent test coverage"] = None + cache_data["parents pass"] = False + else: + cache_data["left_tree_fingerprint"] = repo_left.compute_tree_fingerprint() + result, test_coverage = repo_left.test(TIMEOUT_TESTING_PARENT, N_TESTS) + cache_data["left parent test result"] = result.name + cache_data["left parent test coverage"] = test_coverage + cache_data["parents pass"] = is_test_passed( + cache_data["left parent test result"] + ) # Test right parent - cache_data["right_tree_fingerprint"] = repo_right.compute_tree_fingerprint() - result, test_coverage = repo_right.test(TIMEOUT_TESTING_PARENT, N_TESTS) - cache_data["right parent test result"] = result.name - cache_data["right parent test coverage"] = test_coverage - cache_data["parents pass"] = cache_data["parents pass"] and is_test_passed( - cache_data["right parent test result"] - ) + if not right_success: + # This should never happen. Search output for "Git_checkout_failed" + cache_data["right parent test result"] = TEST_STATE.Git_checkout_failed.name + cache_data["right_tree_fingerprint"] = None + cache_data["right parent test coverage"] = None + cache_data["parents pass"] = False + else: + cache_data["right_tree_fingerprint"] = repo_right.compute_tree_fingerprint() + result, test_coverage = repo_right.test(TIMEOUT_TESTING_PARENT, N_TESTS) + cache_data["right parent test result"] = result.name + cache_data["right parent test coverage"] = test_coverage + cache_data["parents pass"] = cache_data["parents pass"] and is_test_passed( + cache_data["right parent test result"] + ) cache_data["test merge"] = ( cache_data["parents pass"] diff --git a/src/python/write_head_hashes.py b/src/python/write_head_hashes.py index b401c7e2ff..1cdcd3b463 100755 --- a/src/python/write_head_hashes.py +++ b/src/python/write_head_hashes.py @@ -52,6 +52,7 @@ def clone_repo(repo_slug: str) -> git.repo.Repo: except Exception as e: print(repo_slug, "Exception during cloning:\n", e) raise + repo.remote().fetch("refs/pull/*/head:refs/remotes/origin/pull/*") return repo From fe5b0097d30e3d75309ce0a06a5b25dbea4d2dca Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 18:13:17 -0700 Subject: [PATCH 06/20] Use deterministic workdir ids --- src/python/merge_analyzer.py | 10 +++++++--- src/python/merge_differ.py | 6 +++++- src/python/merge_tester.py | 10 ++++++++-- src/python/repo.py | 2 +- src/python/test_repo_heads.py | 4 +++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/python/merge_analyzer.py b/src/python/merge_analyzer.py index 42f7d1d6aa..1360584f12 100755 --- a/src/python/merge_analyzer.py +++ b/src/python/merge_analyzer.py @@ -42,7 +42,7 @@ def merge_analyzer( # pylint: disable=too-many-locals Merges two branches and returns the result. Args: args (Tuple[str,pd.Series,Path]): A tuple containing the repo slug, - the merge data, and the cache path. + the merge data (which is side-effected), and the cache path. Returns: dict: A dictionary containing the merge result. """ @@ -58,8 +58,12 @@ def merge_analyzer( # pylint: disable=too-many-locals return merge_data cache_data = {} - repo_left = Repository(repo_slug, cache_directory=cache_directory) - repo_right = Repository(repo_slug, cache_directory=cache_directory) + repo_left = Repository( + repo_slug, cache_directory=cache_directory, workdir_id=merge_data["left"] + ) + repo_right = Repository( + repo_slug, cache_directory=cache_directory, workdir_id=merge_data["right"] + ) left_success, _ = repo_left.checkout(merge_data["left"]) right_success, _ = repo_right.checkout(merge_data["right"]) diff --git a/src/python/merge_differ.py b/src/python/merge_differ.py index cd8e3a60fa..6a269d38cc 100755 --- a/src/python/merge_differ.py +++ b/src/python/merge_differ.py @@ -51,7 +51,11 @@ def get_merge_fingerprint( return None, None left = merge_data["left"] right = merge_data["right"] - repo = Repository(repo_slug, cache_directory=cache_directory) + repo = Repository( + repo_slug, + cache_directory=cache_directory, + workdir_id="merge-" + left + "-" + right, + ) ( merge_status, merge_fingerprint, diff --git a/src/python/merge_tester.py b/src/python/merge_tester.py index 9564194091..528453e6d0 100755 --- a/src/python/merge_tester.py +++ b/src/python/merge_tester.py @@ -52,7 +52,9 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series: merge_data["parents pass"] = False for branch in ["left", "right"]: commit_sha = merge_data[branch] - repo = Repository(repo_slug, cache_directory=cache_directory) + repo = Repository( + repo_slug, cache_directory=cache_directory, workdir_id=commit_sha + ) test_result, test_coverage, tree_fingerprint = repo.checkout_and_test( commit_sha, TIMEOUT_TESTING_PARENT, N_TESTS ) @@ -77,7 +79,11 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series: merge_data["parents pass"] = True for merge_tool in MERGE_TOOL: - repo = Repository(repo_slug, cache_directory=cache_directory) + repo = Repository( + repo_slug, + cache_directory=cache_directory, + workdir_id="merge-" + merge_data["left"] + "-" + merge_data["right"], + ) ( result, merge_fingerprint, diff --git a/src/python/repo.py b/src/python/repo.py index fddbfaa952..1922897b1c 100755 --- a/src/python/repo.py +++ b/src/python/repo.py @@ -113,6 +113,7 @@ def __init__( self, repo_slug: str, cache_directory: Path = Path(""), + workdir_id=uuid.uuid4().hex, # uuid4 is a random UID ) -> None: """Initializes the repository. Args: @@ -121,7 +122,6 @@ def __init__( """ self.repo_slug = repo_slug self.path = REPOS_PATH / repo_slug.split("/")[1] - workdir_id = uuid.uuid4().hex self.workdir = WORKDIR_DIRECTORY / workdir_id self.workdir.mkdir(parents=True, exist_ok=True) self.repo_path = self.workdir / self.path.name diff --git a/src/python/test_repo_heads.py b/src/python/test_repo_heads.py index 1fa8bca13b..cff1b1cbfb 100755 --- a/src/python/test_repo_heads.py +++ b/src/python/test_repo_heads.py @@ -42,7 +42,9 @@ def head_passes_tests(args: Tuple[pd.Series, Path]) -> TEST_STATE: repo_slug = repo_info["repository"] print("test_repo_heads:", repo_slug, ": head_passes_tests : started") - repo = Repository(repo_slug, cache_directory=cache) + repo = Repository( + repo_slug, cache_directory=cache, workdir_id="head-" + repo_info["head hash"] + ) test_state, _, _ = repo.checkout_and_test( repo_info["head hash"], timeout=TIMEOUT_TESTING, n_tests=3 ) From a8cbdedbaf2dbda45e01c2b21e4d4e855e5537dd Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 18:26:22 -0700 Subject: [PATCH 07/20] Make workdir ids unique --- src/python/merge_analyzer.py | 14 ++++++++++---- src/python/merge_differ.py | 2 +- src/python/merge_tester.py | 4 +++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/python/merge_analyzer.py b/src/python/merge_analyzer.py index 1360584f12..554883ca5d 100755 --- a/src/python/merge_analyzer.py +++ b/src/python/merge_analyzer.py @@ -58,14 +58,20 @@ def merge_analyzer( # pylint: disable=too-many-locals return merge_data cache_data = {} + left_sha = merge_data["left"] + right_sha = merge_data["right"] repo_left = Repository( - repo_slug, cache_directory=cache_directory, workdir_id=merge_data["left"] + repo_slug, + cache_directory=cache_directory, + workdir_id="left-" + left_sha + "-" + right_sha, ) repo_right = Repository( - repo_slug, cache_directory=cache_directory, workdir_id=merge_data["right"] + repo_slug, + cache_directory=cache_directory, + workdir_id="right-" + left_sha + "-" + right_sha, ) - left_success, _ = repo_left.checkout(merge_data["left"]) - right_success, _ = repo_right.checkout(merge_data["right"]) + left_success, _ = repo_left.checkout(left_sha) + right_success, _ = repo_right.checkout(right_sha) # Compute diff size in lines between left and right assert repo_left.repo_path.exists() diff --git a/src/python/merge_differ.py b/src/python/merge_differ.py index 6a269d38cc..4bda04d725 100755 --- a/src/python/merge_differ.py +++ b/src/python/merge_differ.py @@ -54,7 +54,7 @@ def get_merge_fingerprint( repo = Repository( repo_slug, cache_directory=cache_directory, - workdir_id="merge-" + left + "-" + right, + workdir_id="merge-differ-" + left + "-" + right, ) ( merge_status, diff --git a/src/python/merge_tester.py b/src/python/merge_tester.py index 528453e6d0..a953fdf6ef 100755 --- a/src/python/merge_tester.py +++ b/src/python/merge_tester.py @@ -53,7 +53,9 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series: for branch in ["left", "right"]: commit_sha = merge_data[branch] repo = Repository( - repo_slug, cache_directory=cache_directory, workdir_id=commit_sha + repo_slug, + cache_directory=cache_directory, + workdir_id="test-" + branch + "-" + commit_sha, ) test_result, test_coverage, tree_fingerprint = repo.checkout_and_test( commit_sha, TIMEOUT_TESTING_PARENT, N_TESTS From eab9f623fb81c38afab2fb0f481d5dbb586447e2 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 18:42:53 -0700 Subject: [PATCH 08/20] More uniquification --- src/python/merge_tester.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/merge_tester.py b/src/python/merge_tester.py index a953fdf6ef..713ee1ea5b 100755 --- a/src/python/merge_tester.py +++ b/src/python/merge_tester.py @@ -84,7 +84,7 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series: repo = Repository( repo_slug, cache_directory=cache_directory, - workdir_id="merge-" + merge_data["left"] + "-" + merge_data["right"], + workdir_id=f'merge-tester-{merge_tool}-{merge_data["left"]}-{merge_data["right"]}', ) ( result, From bf23b8bcdf0aff8115b7e64bc09151cb1990da2f Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 18:08:34 -0700 Subject: [PATCH 09/20] Better workdir ids --- src/python/merge_analyzer.py | 20 +++++++++++++++----- src/python/merge_differ.py | 6 +++++- src/python/merge_tester.py | 12 ++++++++++-- src/python/repo.py | 3 ++- src/python/test_repo_heads.py | 4 +++- src/python/variables.py | 2 +- 6 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/python/merge_analyzer.py b/src/python/merge_analyzer.py index 37d26975f5..6fea9b0807 100755 --- a/src/python/merge_analyzer.py +++ b/src/python/merge_analyzer.py @@ -42,7 +42,7 @@ def merge_analyzer( # pylint: disable=too-many-locals Merges two branches and returns the result. Args: args (Tuple[str,pd.Series,Path]): A tuple containing the repo slug, - the merge data, and the cache path. + the merge data (which is side-effected), and the cache path. Returns: dict: A dictionary containing the merge result. """ @@ -58,10 +58,20 @@ def merge_analyzer( # pylint: disable=too-many-locals return merge_data cache_data = {} - repo_left = Repository(repo_slug, cache_directory=cache_directory) - repo_right = Repository(repo_slug, cache_directory=cache_directory) - left_success, _ = repo_left.checkout(merge_data["left"]) - right_success, _ = repo_right.checkout(merge_data["right"]) + left_sha = merge_data["left"] + right_sha = merge_data["right"] + repo_left = Repository( + repo_slug, + cache_directory=cache_directory, + workdir_id="left-" + left_sha + "-" + right_sha, + ) + repo_right = Repository( + repo_slug, + cache_directory=cache_directory, + workdir_id="right-" + left_sha + "-" + right_sha, + ) + left_success, _ = repo_left.checkout(left_sha) + right_success, _ = repo_right.checkout(right_sha) # Compute diff size in lines between left and right assert repo_left.repo_path.exists() diff --git a/src/python/merge_differ.py b/src/python/merge_differ.py index cd8e3a60fa..4bda04d725 100755 --- a/src/python/merge_differ.py +++ b/src/python/merge_differ.py @@ -51,7 +51,11 @@ def get_merge_fingerprint( return None, None left = merge_data["left"] right = merge_data["right"] - repo = Repository(repo_slug, cache_directory=cache_directory) + repo = Repository( + repo_slug, + cache_directory=cache_directory, + workdir_id="merge-differ-" + left + "-" + right, + ) ( merge_status, merge_fingerprint, diff --git a/src/python/merge_tester.py b/src/python/merge_tester.py index 9564194091..713ee1ea5b 100755 --- a/src/python/merge_tester.py +++ b/src/python/merge_tester.py @@ -52,7 +52,11 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series: merge_data["parents pass"] = False for branch in ["left", "right"]: commit_sha = merge_data[branch] - repo = Repository(repo_slug, cache_directory=cache_directory) + repo = Repository( + repo_slug, + cache_directory=cache_directory, + workdir_id="test-" + branch + "-" + commit_sha, + ) test_result, test_coverage, tree_fingerprint = repo.checkout_and_test( commit_sha, TIMEOUT_TESTING_PARENT, N_TESTS ) @@ -77,7 +81,11 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series: merge_data["parents pass"] = True for merge_tool in MERGE_TOOL: - repo = Repository(repo_slug, cache_directory=cache_directory) + repo = Repository( + repo_slug, + cache_directory=cache_directory, + workdir_id=f'merge-tester-{merge_tool}-{merge_data["left"]}-{merge_data["right"]}', + ) ( result, merge_fingerprint, diff --git a/src/python/repo.py b/src/python/repo.py index fddbfaa952..7daa2534e1 100755 --- a/src/python/repo.py +++ b/src/python/repo.py @@ -113,6 +113,7 @@ def __init__( self, repo_slug: str, cache_directory: Path = Path(""), + workdir_id=uuid.uuid4().hex, # uuid4 is a random UID ) -> None: """Initializes the repository. Args: @@ -121,7 +122,6 @@ def __init__( """ self.repo_slug = repo_slug self.path = REPOS_PATH / repo_slug.split("/")[1] - workdir_id = uuid.uuid4().hex self.workdir = WORKDIR_DIRECTORY / workdir_id self.workdir.mkdir(parents=True, exist_ok=True) self.repo_path = self.workdir / self.path.name @@ -417,6 +417,7 @@ def compute_tree_fingerprint(self) -> str: .decode("utf-8") .split()[0] ) + print("fingerprint of", str(self.repo_path), "=", result) return result def get_sha_cache_entry( diff --git a/src/python/test_repo_heads.py b/src/python/test_repo_heads.py index 1fa8bca13b..cff1b1cbfb 100755 --- a/src/python/test_repo_heads.py +++ b/src/python/test_repo_heads.py @@ -42,7 +42,9 @@ def head_passes_tests(args: Tuple[pd.Series, Path]) -> TEST_STATE: repo_slug = repo_info["repository"] print("test_repo_heads:", repo_slug, ": head_passes_tests : started") - repo = Repository(repo_slug, cache_directory=cache) + repo = Repository( + repo_slug, cache_directory=cache, workdir_id="head-" + repo_info["head hash"] + ) test_state, _, _ = repo.checkout_and_test( repo_info["head hash"], timeout=TIMEOUT_TESTING, n_tests=3 ) diff --git a/src/python/variables.py b/src/python/variables.py index ae064bae39..338103cc03 100644 --- a/src/python/variables.py +++ b/src/python/variables.py @@ -7,7 +7,7 @@ RIGHT_BRANCH_NAME = BRANCH_BASE_NAME + "_RIGHT" CACHE_BACKOFF_TIME = 2 * 60 # 2 minutes, in seconds -DELETE_WORKDIRS = True +DELETE_WORKDIRS = False REPOS_PATH = Path("repos") WORKDIR_DIRECTORY = Path( ".workdir" From c866d5b46e53de80bd1601742aa5d92ae8aca0fa Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 19:04:40 -0700 Subject: [PATCH 10/20] Turn off debugging --- src/scripts/merge_tools/resolve-adjacent-conflicts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/merge_tools/resolve-adjacent-conflicts b/src/scripts/merge_tools/resolve-adjacent-conflicts index 5ae3800f59..0f867916be 100755 --- a/src/scripts/merge_tools/resolve-adjacent-conflicts +++ b/src/scripts/merge_tools/resolve-adjacent-conflicts @@ -32,7 +32,7 @@ # kdiff3 --auto --cs "ShowInfoDialogs=0" base.txt parent1.txt parent2.txt -o merged.txt # Also, the `--auto` option is ignored for folder comparison. -DEBUG=1 +DEBUG=0 if [ "$#" -eq 0 ] ; then readarray -t files < <(grep -l -r '^<<<<<<< HEAD' .) From 41ff35c702704e684551e6fc917694da645503d9 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 19:09:15 -0700 Subject: [PATCH 11/20] No debugging --- src/scripts/merge_tools/resolve-adjacent-conflicts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/merge_tools/resolve-adjacent-conflicts b/src/scripts/merge_tools/resolve-adjacent-conflicts index 5ae3800f59..0f867916be 100755 --- a/src/scripts/merge_tools/resolve-adjacent-conflicts +++ b/src/scripts/merge_tools/resolve-adjacent-conflicts @@ -32,7 +32,7 @@ # kdiff3 --auto --cs "ShowInfoDialogs=0" base.txt parent1.txt parent2.txt -o merged.txt # Also, the `--auto` option is ignored for folder comparison. -DEBUG=1 +DEBUG=0 if [ "$#" -eq 0 ] ; then readarray -t files < <(grep -l -r '^<<<<<<< HEAD' .) From c872f60d3f30a29d64b8777b2d0e260586f3d185 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 19:12:11 -0700 Subject: [PATCH 12/20] Improve workdir id --- src/python/merge_tester.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/merge_tester.py b/src/python/merge_tester.py index 713ee1ea5b..0a16360a46 100755 --- a/src/python/merge_tester.py +++ b/src/python/merge_tester.py @@ -84,7 +84,8 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series: repo = Repository( repo_slug, cache_directory=cache_directory, - workdir_id=f'merge-tester-{merge_tool}-{merge_data["left"]}-{merge_data["right"]}', + workdir_id=f"merge-tester-{merge_tool.name}-" + + f'{merge_data["left"]}-{merge_data["right"]}', ) ( result, From daeeffbe9b36e6f06a3cb5f4aeafe7543f9911c0 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 30 Oct 2023 19:19:19 -0700 Subject: [PATCH 13/20] Uniquification --- src/python/merge_tester.py | 3 ++- src/python/test_repo_heads.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/python/merge_tester.py b/src/python/merge_tester.py index 713ee1ea5b..0a16360a46 100755 --- a/src/python/merge_tester.py +++ b/src/python/merge_tester.py @@ -84,7 +84,8 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series: repo = Repository( repo_slug, cache_directory=cache_directory, - workdir_id=f'merge-tester-{merge_tool}-{merge_data["left"]}-{merge_data["right"]}', + workdir_id=f"merge-tester-{merge_tool.name}-" + + f'{merge_data["left"]}-{merge_data["right"]}', ) ( result, diff --git a/src/python/test_repo_heads.py b/src/python/test_repo_heads.py index 093ab3a9d7..b105721bbc 100755 --- a/src/python/test_repo_heads.py +++ b/src/python/test_repo_heads.py @@ -43,7 +43,11 @@ def head_passes_tests(args: Tuple[pd.Series, Path]) -> TEST_STATE: print("test_repo_heads:", repo_slug, ": head_passes_tests : started") try: - repo = Repository(repo_slug, cache_directory=cache) + repo = Repository( + repo_slug, + cache_directory=cache, + workdir_id="head-" + repo_info["head hash"], + ) except FileNotFoundError as e: print("test_repo_heads:", repo_slug, ": head_passes_tests :", e) return TEST_STATE.Git_checkout_failed From 8a67eb9ce990862362d419c5062412a38a53bd85 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 31 Oct 2023 09:39:44 -0700 Subject: [PATCH 14/20] Update goals --- .../merges_analyzed/Algorithms.csv | 12 ++--- .../merges_analyzed/JSCover.csv | 52 +++++++++---------- .../merges_analyzed/ez-vcard.csv | 26 +++++----- .../merges_tested/JSCover.csv | 4 +- .../merges_tested/ez-vcard.csv | 3 +- .../tables/all/table_feature_main_summary.tex | 28 +++++----- .../tables/all/table_summary.tex | 28 +++++----- 7 files changed, 77 insertions(+), 76 deletions(-) diff --git a/test/small-goal-files/merges_analyzed/Algorithms.csv b/test/small-goal-files/merges_analyzed/Algorithms.csv index 4cd70138b5..2c16449c0c 100644 --- a/test/small-goal-files/merges_analyzed/Algorithms.csv +++ b/test/small-goal-files/merges_analyzed/Algorithms.csv @@ -12,10 +12,10 @@ idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tr 11,refs/heads/master,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,128ccf0f25f401f2218c03166a6f4ebc5ce21385,03d7c1872d5b17434fd460f7b8a0b8c9c90849f7,a parent is the base,39,False,3be3867629eb4ed141509a8a8b8e32f4f535d8fc94803e6d896b31a08dbdad6b,Tests_passed,0.97108234646103,True,16ffc55222112897157b65a9a305d7d9f0a6d2c91d4768dd26d885fa148d3c33,Tests_passed,0.9711181405583826,False 12,refs/heads/master,128ccf0f25f401f2218c03166a6f4ebc5ce21385,1f8f61c50d4e36ab8677b271a58648e90a2f1b28,22ee3ce03f74349ed3b0f36bfdf1dc119e2be70b,a parent is the base,29,False,42a1ba4ec7eb8649d2d3299078713b66afc5bb00b269a92be940e4b4ad14163c,Tests_passed,0.9712826176998481,True,3be3867629eb4ed141509a8a8b8e32f4f535d8fc94803e6d896b31a08dbdad6b,Tests_passed,0.97108234646103,False 13,refs/heads/master,c8604d6f6d23a0cd5d3f9fac472dbf467fe11b8e,7ebdadbc657a68da22826ce3cc402e3635e80d4c,fd87cbc2cdbe813564f0a2c7e8070964220cdcc6,a parent is the base,21,False,480c0d0c75bba90a670ac3c07f6afc5c61c394d0d6c1ba59468503b47ad2e849,Tests_passed,0.9712270023516393,True,4487d24e3a4cfb37622bc594cbd8e3ec74fa77f0381121247d246d83434e5867,Tests_passed,0.9712826176998481,False -14,refs/remotes/origin/pull/27,fdd92255570bf37534ba36f632773923d60e32d2,8edac208c376e88626e88a720c9166fef9588853,1a71e9f95183a089b2b72a0cb42337681594e699,,406,False,,Git_checkout_failed,,False,d246e3670ab5e0ba5a4d0ea8c24a62b33d3fe0f78c1a821a23bac0bc739c5ec3,Tests_passed,0.9707940780619112,False -15,refs/remotes/origin/pull/37,6b917cc6a33eb87fec2dcdafc845177f470ca374,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,68f656ff10751259284d083e8fdf8e82f7ada15f,,0,False,,Git_checkout_failed,,False,,Git_checkout_failed,,False -16,refs/remotes/origin/pull/37,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,37e80741a853a6626a77aed38caa07f4e44d85b2,8b2e3b06185e4a111ae987db7fa01901974036cd,,209,False,,Git_checkout_failed,,False,cb9d190fba5816b072ac476d8c839e907344d0b8211d512779f5521a6dbf954e,Tests_passed,0.97102615694165,False -17,refs/remotes/origin/pull/37,680f2603dc41bb7c5843b0fa342e829210611d9d,1477ce25eaad76986f50aa5b740e2c023ff31de2,879fb60972e4e83fdb7b5337db66c8afbfb95ffc,,0,False,,Git_checkout_failed,,False,,Git_checkout_failed,,False -18,refs/remotes/origin/pull/37,d1279d1b59ecba7f01de8b2c1995562f92b2e255,b636ef254a97ae830baa6d783121de7890818785,9497e2f66d7af3feedd3106faa6e8b0aa6118b41,,0,False,,Git_checkout_failed,,False,,Git_checkout_failed,,False -19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,262,False,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,0.9711205749268033,False,,Git_checkout_failed,,False +14,refs/remotes/origin/pull/27,fdd92255570bf37534ba36f632773923d60e32d2,8edac208c376e88626e88a720c9166fef9588853,1a71e9f95183a089b2b72a0cb42337681594e699,,17,False,b00db31ee0ff34d2b38aaba8f8c3346627eafe18da6b0102a2b8d0cb75d11567,Tests_passed,0.9708176438945669,True,d246e3670ab5e0ba5a4d0ea8c24a62b33d3fe0f78c1a821a23bac0bc739c5ec3,Tests_passed,0.9707940780619112,False +15,refs/remotes/origin/pull/37,6b917cc6a33eb87fec2dcdafc845177f470ca374,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,68f656ff10751259284d083e8fdf8e82f7ada15f,,94,False,7aa5e2f53ad1560daf3a96bd8e663a929817c73938d959fa60d355658fa2e2be,Tests_failed,0.0,False,755c5c56e067df81d5c17ef49dc1f4e7678609ab296b9a8ab2dece46fe0e4fde,Tests_failed,0.0,False +16,refs/remotes/origin/pull/37,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,37e80741a853a6626a77aed38caa07f4e44d85b2,8b2e3b06185e4a111ae987db7fa01901974036cd,,123,False,750234862e2408f85646f30ab36d0dbcfdac88dba376d8c3d61d70f4487afd25,Tests_failed,0.0,False,cb9d190fba5816b072ac476d8c839e907344d0b8211d512779f5521a6dbf954e,Tests_passed,0.97102615694165,False +17,refs/remotes/origin/pull/37,680f2603dc41bb7c5843b0fa342e829210611d9d,1477ce25eaad76986f50aa5b740e2c023ff31de2,879fb60972e4e83fdb7b5337db66c8afbfb95ffc,,96,False,bdf6e72ad28bbb283d5760e9a231b0df40640519b3e3cfd5e3f0ccda8c93fc8d,Tests_passed,0.9459424423126782,False,1a54a2f1e9d5a185842f1ebcbb59a35d16b5d948671ad2f6eb75fc88bf0831d3,Tests_failed,0.0,False +18,refs/remotes/origin/pull/37,d1279d1b59ecba7f01de8b2c1995562f92b2e255,b636ef254a97ae830baa6d783121de7890818785,9497e2f66d7af3feedd3106faa6e8b0aa6118b41,,70,False,876fec686e8da05d3343c630aba013323e9f9cdd6bf4252242d093211d7052d4,Tests_failed,0.0,False,481269e0b8f9bfc8b74b1541ab78f98aa9364d3e17bf7f640b95ffc2376ab1c4,Tests_failed,0.0,False +19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,110,False,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,0.9711205749268033,True,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,0.9711321005720367,False 20,refs/remotes/origin/pull/73,9c8740d0e38ba93f08bfb462d16cab448a0197f1,7ebdadbc657a68da22826ce3cc402e3635e80d4c,4e2214112de23d1319ce77736547fa8900384e7c,a parent is the base,1006,False,480c0d0c75bba90a670ac3c07f6afc5c61c394d0d6c1ba59468503b47ad2e849,Tests_passed,0.9712270023516393,True,d02d6c3c9e716e52368f24ba6495f28e8fd4773601dc017f861e81fd4e6bfaf8,Tests_passed,0.974043350280974,False diff --git a/test/small-goal-files/merges_analyzed/JSCover.csv b/test/small-goal-files/merges_analyzed/JSCover.csv index 9155413837..8b776526cd 100644 --- a/test/small-goal-files/merges_analyzed/JSCover.csv +++ b/test/small-goal-files/merges_analyzed/JSCover.csv @@ -1,28 +1,28 @@ idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge -1,refs/heads/master,31361bbe2317967a9c47cfc4437e2ce706f79056,fe64f8c1071a356027e49247fd506edc23566c4d,ab9b573de54d1014b5d9822adc9d9e5cf43ba8c0,,158,False,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Tests_passed,0.8745331673483906,True,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Tests_passed,0.8745331673483906,False -2,refs/heads/master,fe64f8c1071a356027e49247fd506edc23566c4d,b9ead12fd4a28a9fd7074ad4e97128943b072828,f5cb9ece38b7bd9ae97d7a55490476b84a2336df,a parent is the base,148,False,5ff8c7cbf214a58896dbca33fafb6940f2a6e19222f5b69d5660ebcf7a63b615,Tests_passed,0.8757646247953821,True,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Tests_passed,0.8745331673483906,False -3,refs/heads/master,d6f0d1998a8db93117ba9c261d3b35d03633dc59,0eca5983951641b5d0884e6ce8fd162185d0cf05,d686e46aa0582b7dbee1f0d8664d6cb4b56600ec,a parent is the base,82,False,81fad259714fc7be34c891dcd38697dfcea66a688f159860ad3fc0bc3d7b2c8f,Tests_passed,0.8745331673483906,True,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Tests_passed,0.8757646247953821,False -4,refs/heads/master,f7a4cc17c3b97f600f5a982522100d2b0200a981,f3876ebe83363de9387bba9ec14d436e2d74d2b3,f59722bd1d3dcbf9fc183a49ee0e28ea3c42edf8,a parent is the base,82,False,78a32d0357350b1739b621ff4f8297c4141adfe14964bf37d2cf8635f59896fb,Tests_passed,0.8755287009063444,True,6766d3d6247010a11c2027986e97bce770780e18e2c5e486c70fdd0a06cbafc2,Tests_passed,0.8742872416250891,False -5,refs/heads/master,526eaed4a82ee4ec9bb018e6d541c848d2bfdd0d,1adf11c82653576753af0502bfc1f63900d85780,e562b7ed71187c95e310f85e99d1325dbd49e331,a parent is the base,19,False,c3e9263c4984dafd99b3c3cdb5569e1483f9d59e43cb5e170379467344b3b56e,Tests_passed,0.8754104026265768,True,6508da794aaedfae6ba4b9e1e118932e972cb44c30bb32e8ad80ca5d0146d031,Tests_passed,0.8754104026265768,False -6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,e465e8275091cf468e4cf6fc70d89656f57cf4c656af0456a11cdf6af3253bbf,Tests_passed,0.8737521514629948,True,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,0.8754104026265768,True -7,refs/heads/master,5dc4fe25315e31fb1d6c3f58d802283634b6e37b,428706a429ed1a3dca09588e989597fd9a9cb673,26335cfc92a5aaa2df829c7ba52ac834ad1c4080,a parent is the base,122,False,e465e8275091cf468e4cf6fc70d89656f57cf4c656af0456a11cdf6af3253bbf,Tests_passed,0.8737521514629948,True,9cb10c7a18b0827515c8962feb0def246396ff1e9639975ab6a17982de5aeff0,Tests_passed,0.8753781004234725,False -8,refs/heads/master,9572ad5cfd2f4c20700e27f16c9e906e009d7137,c92c401a4335465b77e3bf95c47a3297fa633b5c,62d33c1ccc686ed687d04c8e874f0c36bbcfc43e,a parent is the base,17,False,a7791741299b8249b12fa1ba78e65b8dd4fd990402e12848d267a380b7b0620d,Tests_passed,0.8737521514629948,True,a3ff762db463047ab939b44262e47e5416dc780cc291bbe2120d0baae0ef87d2,Tests_passed,0.8737521514629948,False -9,refs/heads/master,9ed0dc2b5892b2b2a782435b0a5dd42f90737b97,4ba5c58dfb6bf266259b80ab2fe19057910b6dba,7d6f336981e2d3c0a3e81fc663b6e4590f8aab0b,a parent is the base,13,False,297835fb2e58380a341e6e75e7c33c00186dfc4e0b7b31a69ebbf67e3ba57ceb,Tests_passed,0.8739040742650851,True,297835fb2e58380a341e6e75e7c33c00186dfc4e0b7b31a69ebbf67e3ba57ceb,Tests_passed,0.8739040742650851,False -10,refs/heads/master,c5bb794c4ca20c492818cdc13d4c72ad57961835,d709ecd47d92508d22f60e288fbe49b36f4b5246,9539280c2e350f6104b01c366ad8557e174f46da,a parent is the base,22,False,6b8077aa7e883faaacabd1c87129483e24bc3b52db05de57a06df208780de07b,Tests_passed,0.8739040742650851,True,8b354bb61ed97a8db7f9f0a150bffe0ef5171b897e9a21187c13c8e109a28ecd,Tests_passed,0.8739040742650851,False -11,refs/heads/master,58557bba03e3cd911b334f451d7bf20c84d54045,0eee54986010067c05972426937c3459b979a840,a4fb3645a032633128f78786d779101b46a16581,a parent is the base,93,False,43e509436145d7e7ce41d0af1132799d5736cfc2549853d5ebfa5a13fbc3ef2f,Tests_passed,0.8739040742650851,True,d06ed9ec6190c175d8152ed3a32c59391a1a803e3f2729772a47f053792eb59f,Tests_passed,0.8739040742650851,False -12,refs/heads/master,5c0f3bc432afa70ae19ced28fd4655effffa643f,bf98af8c6a8559d82a24d8f6f11d5fc23d29523e,f04fe03a282ca2520de93a3f13fe4c06146e5823,a parent is the base,39,False,b6f1f6b13aaa004c38203a67fe74af6d6860d049483e8ca72c7e9d1d7aeb98f3,Tests_passed,0.8715872879166308,True,959add4febe6be0d45c2a5a32cab88e6c865f7b17611c6e127ecad6196aa8c93,Tests_passed,0.8715872879166308,False -13,refs/heads/master,885ba1e858932e9715e9b27a722a129e2611caab,c5f2600a6830cb2fc14647c98a9038832d20677f,48ce23c6b5857dd37a5658eb544fad390a4e3d44,a parent is the base,153,False,85e3e158cd9ded526f17a94e53848374465b55c26cb1111bbbda2df4e57380c0,Tests_passed,0.8713033012379643,True,0e06d8883166791f016f1b8aa3b6a4da5219fcaf198108bf15a31f107c0fc174,Tests_passed,0.8711645896003438,False -14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,936bf008baece42fc21caaa7a4376675ff4566d092d9f204630d7a18ec8c5a60,Tests_passed,0.8512629399585921,True,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,0.8373498208388955,True -15,refs/heads/master,89ffb42fa4b9efa275282cd90369be4423441a94,5a3b21b0db2cbc45f1dccbeae832654c4b5c812e,b8d19bf433f60c02f28d046702a1ea86a157ecf6,a parent is the base,21,False,2d144af3fda0edc2e9c4e17b83452bbe9e7e8f9a6a9c61ebb835e4d05ec24562,Tests_passed,0.8502704952143154,True,92769bfef67a7395b495edffcf8458dbd8fa775b3d422da834d94d50c4e19169,Tests_passed,0.8498461026536894,False -16,refs/heads/master,c4db946b2d372f8bde079792b1cee93ac36921d2,3d76e008055d175af8fdbb90d6c5a0ced62faf0d,4534140b2526b36b39bcdf6d417d977db7a5cb1a,a parent is the base,23,False,e95f74676382558cef31d513281925fb07a8066d50abf814af1e1de9f85b6a64,Tests_passed,0.8336750155985382,True,37f54b1b5ddba375f0cdb6e11ea551ed9a4a3b42b8c86606332a983cd57cf7fd,Tests_passed,0.8336750155985382,False -17,refs/heads/master,ea0851ac5e27d2a1a13acd2110094c46c44a849e,c0603903e4b5caeb83d2c93ceabba1e9ea59af19,e405a7f2926be3103a388e990701af1f260bc905,,278,False,73fd788287e09d74fd3655ff96ae970dfdbef23a7c5edbf4d8a283fc9596366e,Tests_passed,0.827537386072029,True,18b06a4976504b391ab8b266d92762442a49f9ba0ce5fda9cc9a60c8c816f8d6,Tests_passed,0.8335267339105596,False -18,refs/heads/master,2a9f0eb4e7a59587ef0fb8a9312ba5edf0078145,92d6114663b80b24d1f9bb6d282138cf6094857e,b9a2ee7526cf561aa2ff511fe9872792bd315e91,,338,False,7eec20744772899894326be9b7de81f71f0f127d0a5573acabb8a826e2b858ad,Tests_passed,0.8131766447672805,True,bea0812d7548cfff42fa82c9a20e56b4b8038e296342bef04d3a07553d39ea1c,Tests_passed,0.8131766447672805,False -19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,212,False,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0.8075090527920716,True,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,0.811941132637854,False -20,refs/heads/master,10f916b7a0fd5953ae6f684cadd28fa87e9124e4,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,0256cc6b3b9f9470458ff418e6648c635c20e787,,142,False,7a7c00cd0ef7aa1e210f3600218a6e7b465c5ed22543a884fae1bfe485fd20d9,Tests_failed,0.0,False,cad6bb22e5482c4251c8f3cf3cdbf7f09f32a63d145064d53f9a309996a88e76,Tests_passed,0.8075090527920716,False -21,refs/heads/master,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,b9f47e216af0bc46830e0cb0c6964218511bbb3f,974ce1770dc602051b320619e240603cc5358d64,,2624,True,e18b3ba88cc7d565b615dd8623136da1d63630febebde162e2cffc54c842eb9e,Tests_passed,0.8075090527920716,False,04a326f5e41eef8b880988b9b468ada3cf2b34c550de24870f818d63952e637d,Tests_failed,0.0,False -22,refs/heads/master,00c10a4e7f42a484209a443934c833c5970f462f,8e0ad29ac0d484db3eccc4bee791b72cc6222e4c,530d40378d2d17276f71b18f871637fea2937ecf,,31,False,f92b72fcf3d326ca0fdc784bb1226153675afbf09fa9cbac29e0f8de9f9d4e48,Tests_failed,0.0,False,e6da00deaaa40d14d6a85237995176b78d9563e7e2470d23559f51d6768ebbae,Tests_failed,0.0,False -23,refs/heads/master,adf6fd024df05daf3236ce42e8cd90b5e4448131,dca3e3596b0b880e9eb4406490488ce93bc9116a,0575f5e918deec26aba2eb2a18f0e87af679d81b,a parent is the base,22,False,dbdc04f0b08acd21446fb431ce8df15954f4e80146f1bbc7555632256bf4e3bd,Tests_failed,0.0,False,4764cb2258749faad52f9aeaea6000072b3799ca436a09ae877075683f310505,Tests_failed,0.0,False -24,refs/heads/master,3ae921c45ac9a68844bbdc1d53a8a7ca262fb6b7,8fb1d13ac9c28ccf9723a4328141816f224337b9,aec694fe670b35eb827c473f5fbaf205cd59a0ba,,6542,False,bb4ed38dc2166762d5a373aa60d2d4930bc7e52d49b8c4b735d72c6a7f27017c,Tests_failed,0.0,False,876c70f3e5dc78debfb39901faa59e33bda1b28ae33baf60cfc5a7d6ae22eea2,Tests_failed,0.0,False -25,refs/heads/master,ac65c8f97187f99331093624c7829d3688a50297,fb4312ddbbf301484ff0e1243cfdf12d6a2fb840,c8937ebc236d924201af98021a50091ab0ee013a,,129,True,1df962e38d7eb57b4089203442b3adabd0fa69068107fc155e2689a12823efe2,Tests_failed,0.0,False,df60362dc02bda92c3989d190bbfeac4fbe5f648b0049001f2b6cb79b4b62c48,Tests_failed,0.0,False +1,refs/heads/master,31361bbe2317967a9c47cfc4437e2ce706f79056,fe64f8c1071a356027e49247fd506edc23566c4d,ab9b573de54d1014b5d9822adc9d9e5cf43ba8c0,,158,False,715e031985dc349a5c57d483c366ba67a6790bb4628ca7e1b5c4588fd3f3f2fd,Tests_passed,0.8745331673483906,True,b2c4f64ddfab2c310b5360e0b9ffe73b34c7e0cbb70a97039869c30444f61190,Tests_passed,0.8745331673483906,False +2,refs/heads/master,fe64f8c1071a356027e49247fd506edc23566c4d,b9ead12fd4a28a9fd7074ad4e97128943b072828,f5cb9ece38b7bd9ae97d7a55490476b84a2336df,a parent is the base,148,False,06e1fad45b4b77a2e935f01b720a029c937b189f73c833d0015bc67aaecf59aa,Tests_passed,0.8757646247953821,True,715e031985dc349a5c57d483c366ba67a6790bb4628ca7e1b5c4588fd3f3f2fd,Tests_passed,0.8745331673483906,False +3,refs/heads/master,d6f0d1998a8db93117ba9c261d3b35d03633dc59,0eca5983951641b5d0884e6ce8fd162185d0cf05,d686e46aa0582b7dbee1f0d8664d6cb4b56600ec,a parent is the base,82,False,cddd0a5fa49c1198d3e74d40a62698b9f1687425be8729d2fc84ffc83eccff01,Tests_passed,0.8745331673483906,True,7b61baf907db4318721366736669e75431a74be63ca66832a42416bb5445509d,Tests_passed,0.8757646247953821,False +4,refs/heads/master,f7a4cc17c3b97f600f5a982522100d2b0200a981,f3876ebe83363de9387bba9ec14d436e2d74d2b3,f59722bd1d3dcbf9fc183a49ee0e28ea3c42edf8,a parent is the base,82,False,78830dbad0e02d5258bc5c1bc0108a98815adc86dcb5a4bf0c97f35abef2d7a2,Tests_passed,0.8755287009063444,True,51a2a2041f3f65c06e27fe783bde12355a5bbddeaf1f1d1a69ed8c0d56dbc942,Tests_passed,0.8742872416250891,False +5,refs/heads/master,526eaed4a82ee4ec9bb018e6d541c848d2bfdd0d,1adf11c82653576753af0502bfc1f63900d85780,e562b7ed71187c95e310f85e99d1325dbd49e331,a parent is the base,19,False,964af80685b0240a0644adcd374f4d42335ad6c8b5333929afd7c6ff1faa9ddb,Tests_passed,0.8754104026265768,True,53d259c5247895bba693098f567a012aca447cd617b8d6d5c8c109cfa041fa60,Tests_passed,0.8754104026265768,False +6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,4bccbf9668aee7cb98f69f5e6e81091dde91ae8b64b4e431f07dd54defffe88b,Tests_passed,0.8737521514629948,True,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,0.8754104026265768,True +7,refs/heads/master,5dc4fe25315e31fb1d6c3f58d802283634b6e37b,428706a429ed1a3dca09588e989597fd9a9cb673,26335cfc92a5aaa2df829c7ba52ac834ad1c4080,a parent is the base,122,False,4bccbf9668aee7cb98f69f5e6e81091dde91ae8b64b4e431f07dd54defffe88b,Tests_passed,0.8737521514629948,True,2cf5ccb962566884eac7c092960a9302e7f98414f0f821f4d72093df57bc00a2,Tests_passed,0.8753781004234725,False +8,refs/heads/master,9572ad5cfd2f4c20700e27f16c9e906e009d7137,c92c401a4335465b77e3bf95c47a3297fa633b5c,62d33c1ccc686ed687d04c8e874f0c36bbcfc43e,a parent is the base,17,False,122fea14fc8885146e62e4aed3ad3b4b0777b15cf8aacbf9acd29abec4defd59,Tests_passed,0.8737521514629948,True,a8c523fb08b16b8fa1677739fb09c4df7e05cc4901d3f7e8a2f5eeec461d6410,Tests_passed,0.8737521514629948,False +9,refs/heads/master,9ed0dc2b5892b2b2a782435b0a5dd42f90737b97,4ba5c58dfb6bf266259b80ab2fe19057910b6dba,7d6f336981e2d3c0a3e81fc663b6e4590f8aab0b,a parent is the base,13,False,a214977d479d2e086767d18512525684867933d65acdd3e2b8cab40359532251,Tests_passed,0.8739040742650851,True,a214977d479d2e086767d18512525684867933d65acdd3e2b8cab40359532251,Tests_passed,0.8739040742650851,False +10,refs/heads/master,c5bb794c4ca20c492818cdc13d4c72ad57961835,d709ecd47d92508d22f60e288fbe49b36f4b5246,9539280c2e350f6104b01c366ad8557e174f46da,a parent is the base,22,False,1c45199e7349fab49628a13532ecc8737c71f3b1d6be1d69afdd7041b5f988ed,Tests_passed,0.8739040742650851,True,29d8f8b8789c968de5fd0f6bb25a48df01efb0e2122a052f65ac128624c4b34b,Tests_passed,0.8739040742650851,False +11,refs/heads/master,58557bba03e3cd911b334f451d7bf20c84d54045,0eee54986010067c05972426937c3459b979a840,a4fb3645a032633128f78786d779101b46a16581,a parent is the base,93,False,38db326a5b5974ec97a1b34b406509b8744db5cbc0eb36a4f889e50338a4d81f,Tests_passed,0.8739040742650851,True,4f0e2e141ca9c89e490c6d794a4eb07e1ad953409b1bccfb2931476faea80c20,Tests_passed,0.8739040742650851,False +12,refs/heads/master,5c0f3bc432afa70ae19ced28fd4655effffa643f,bf98af8c6a8559d82a24d8f6f11d5fc23d29523e,f04fe03a282ca2520de93a3f13fe4c06146e5823,a parent is the base,39,False,e5fefe0c9436e9de7b32df10c8ddb8338f9cd8c085db5b93dc63a8dbefffad2e,Tests_passed,0.8715872879166308,True,ede66278232be08b58054711aaffd9a1d736f1fa9b2ee35b23ae1b08beee6089,Tests_passed,0.8715872879166308,False +13,refs/heads/master,885ba1e858932e9715e9b27a722a129e2611caab,c5f2600a6830cb2fc14647c98a9038832d20677f,48ce23c6b5857dd37a5658eb544fad390a4e3d44,a parent is the base,153,False,f483830f52dc91ef538393e96be09cc1a5709922c615c4ee9193748b9fa0b8c1,Tests_passed,0.8713033012379643,True,5ef2f6d4786500e797c69026fb9b95a35d917d2750092cda39ec5d6fe1423686,Tests_passed,0.8711645896003438,False +14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,fc9694841d9bbd7893909fa2aacdf185ed91efba26c927eb0300071bc31e8e45,Tests_passed,0.8512629399585921,True,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,0.8373498208388955,True +15,refs/heads/master,89ffb42fa4b9efa275282cd90369be4423441a94,5a3b21b0db2cbc45f1dccbeae832654c4b5c812e,b8d19bf433f60c02f28d046702a1ea86a157ecf6,a parent is the base,21,False,2fee0fcdcdbaf0e8c0c562d97b23b6caba3ca06667aee2a28ddb5418a070cc8d,Tests_passed,0.8502704952143154,True,aaec44b3ebf18120f3f56f2f8f8616c4aaf1ea6447e8f6d81749532c4d7200d6,Tests_passed,0.8498461026536894,False +16,refs/heads/master,c4db946b2d372f8bde079792b1cee93ac36921d2,3d76e008055d175af8fdbb90d6c5a0ced62faf0d,4534140b2526b36b39bcdf6d417d977db7a5cb1a,a parent is the base,23,False,0ab8c56a6f2fc108120ca5200af33de2e040f0e01e3dd7cafb12ddd86260122a,Tests_passed,0.8336750155985382,True,f8bd5756d4f6627da7db688b71caedc2046be235a2b989ea00e9285bd7c1d80c,Tests_passed,0.8336750155985382,False +17,refs/heads/master,ea0851ac5e27d2a1a13acd2110094c46c44a849e,c0603903e4b5caeb83d2c93ceabba1e9ea59af19,e405a7f2926be3103a388e990701af1f260bc905,,278,False,7b87079363898b197c3360066cba3e86bc4a427ee3800eb12308821cc3e0b451,Tests_passed,0.827537386072029,True,54db670b391ca0079213b9eb2d0f7d5fff2bfd1929dbed30081abde8376c9861,Tests_passed,0.8335267339105596,False +18,refs/heads/master,2a9f0eb4e7a59587ef0fb8a9312ba5edf0078145,92d6114663b80b24d1f9bb6d282138cf6094857e,b9a2ee7526cf561aa2ff511fe9872792bd315e91,,338,False,38afb55b7289c9f37e383c56c9ca2d9cef23871951e968d060443f689d045733,Tests_passed,0.8131766447672805,True,ad10c383815d726b821c60aeb74b809230740f7e8a2089725254e7e1086dbb83,Tests_passed,0.8131766447672805,False +19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,212,False,7399f66c107b3e5c2838845e83b790e46dbf8ae6fc1feca4ee34a35b5f4249ce,Tests_passed,0.8075090527920716,True,12399cc55a33548baba7235102ee7df63eaf3bd09ed103f00450507479d1c360,Tests_passed,0.811941132637854,False +20,refs/heads/master,10f916b7a0fd5953ae6f684cadd28fa87e9124e4,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,0256cc6b3b9f9470458ff418e6648c635c20e787,,142,False,a5e2d730e3024af1886e4f02c30ef98cd630c79b464b7da98b96f8bb87498daa,Tests_failed,0.0,False,c8581044c504f9271a332b396506c545166320853cc5c552f5138c66f985d4ed,Tests_passed,0.8075090527920716,False +21,refs/heads/master,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,b9f47e216af0bc46830e0cb0c6964218511bbb3f,974ce1770dc602051b320619e240603cc5358d64,,2624,True,7f5c0a16df1c4200347e44c5a7d409c4e9a810182ab25672c3f8b50381cfdc30,Tests_passed,0.8075090527920716,False,bfc219ca0655ff22f0000037f28c10aa662beb1f2df86b79bd83f791928be6b5,Tests_failed,0.0,False +22,refs/heads/master,00c10a4e7f42a484209a443934c833c5970f462f,8e0ad29ac0d484db3eccc4bee791b72cc6222e4c,530d40378d2d17276f71b18f871637fea2937ecf,,31,False,84564edff80f8e5668e1d11eea9b1c823fa8304351511abc275529e61f229eaa,Tests_failed,0.0,False,90729dfe383a1160a5daba76fafe9f272825abae2c66dd399a98655277133a59,Tests_failed,0.0,False +23,refs/heads/master,adf6fd024df05daf3236ce42e8cd90b5e4448131,dca3e3596b0b880e9eb4406490488ce93bc9116a,0575f5e918deec26aba2eb2a18f0e87af679d81b,a parent is the base,22,False,4b770b26ad5313b26033b8d4ffb0d045d7ac3575b4159b844b9d073d0c264ef7,Tests_failed,0.0,False,d9e5cfdc8e9d36073389f6aa84627cb6729c2a377eeafa4b27cf081428cf1391,Tests_failed,0.0,False +24,refs/heads/master,3ae921c45ac9a68844bbdc1d53a8a7ca262fb6b7,8fb1d13ac9c28ccf9723a4328141816f224337b9,aec694fe670b35eb827c473f5fbaf205cd59a0ba,,6542,False,12b9414de4aaf7c7c912fbd7509698016c37c66e7ef644c464d43aaaba2d634b,Tests_failed,0.0,False,c11ed1b8de207e534a9767c5b72fef2a66c5519a65ec3723d67948a83e5d2a0f,Tests_failed,0.0,False +25,refs/heads/master,ac65c8f97187f99331093624c7829d3688a50297,fb4312ddbbf301484ff0e1243cfdf12d6a2fb840,c8937ebc236d924201af98021a50091ab0ee013a,,129,True,b993f4d701fd4132bfcfa5bdd11b897b4ba3b11471f846c0bb756c73dd4be639,Tests_failed,0.0,False,0603d0eab8bf807519e292eccc4a7e6fe94e2f590219ac6b5bd1e84f9347ed27,Tests_failed,0.0,False 26,refs/remotes/origin/gh-pages,9217160ed01a2bb7e57cd07001fc0da20135ad21,49868943e60fdb40de33c4416aae6a8517ef3d7f,bd0c5960622a73573c9fa5fb0f356ba575c3676c,a parent is the base,22,False,39bbf65e36cdcbd8db1f215dd86c51138d8cf200fc3b381b93331e8b278a4075,Tests_failed,0.0,False,65119fc78d1b2e903eeb86d7cbf83a3803785b5526d53c535a8b63e548720be5,Tests_failed,0.0,False -27,refs/remotes/origin/pull/94,c905e6a5da47ddf684d6cb6b6c52a6d5cb0d2e3b,390eb1dbfc709f2b75889697a9296ffeb06424a4,2e483d3cd3abbb5b6af28ea519278f597ccded96,,41503,True,,Git_checkout_failed,,False,21c90bb9de31ea68ac17b0cb22d88ad5a1d668172ae43633e9cf5b0fdf5dd8eb,Tests_failed,0.0,False +27,refs/remotes/origin/pull/94,c905e6a5da47ddf684d6cb6b6c52a6d5cb0d2e3b,390eb1dbfc709f2b75889697a9296ffeb06424a4,2e483d3cd3abbb5b6af28ea519278f597ccded96,,2027,True,fca7493914ed62d0b1ba68ec53d619a878dedf19ac5aa7ca6b4bf9d14eb27250,Tests_failed,0.0,False,2cd7b89dd6c234524014530be5aa0c9aa606c235eb41d96a01e37babd7cf066f,Tests_failed,0.0,False diff --git a/test/small-goal-files/merges_analyzed/ez-vcard.csv b/test/small-goal-files/merges_analyzed/ez-vcard.csv index 1bd5d1dfc9..654a7bc80c 100644 --- a/test/small-goal-files/merges_analyzed/ez-vcard.csv +++ b/test/small-goal-files/merges_analyzed/ez-vcard.csv @@ -1,13 +1,13 @@ -idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left parent test result,left_tree_fingerprint,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge -1,refs/heads/master,0637f5fc19cf6ad79cd2c58981facc3678d5bbff,b8b0b0c8e1dff237975942022a42c6c25b9d9741,3c10bf587f097be3e2a77b0d2d556e6f9efd97b1,,77,False,Tests_passed,e677696d99009543543b67e43376936df48da7710eff36c66a37d4eaa1fc98e5,0.8535777267140491,True,d187f1c73849a223e794329f88807bf76f60a16041876a0896846dbce5bb1861,Tests_passed,0.853562075784298,False -2,refs/heads/master,633e9c677f26c1cae476d9ce43331cc30bd8f9e8,af63ebf1a441d0165bab7f6250caf0e2793b9829,22631a4817aa29b231919cb5d8c05d935386b763,a parent is the base,17,False,Tests_passed,f598d3120ef68309ed315a47e98d429cc60c53fa77a4189f6e8a43dfdf55fa25,0.85334653571333,True,9e86790517ce177c1a909da94e1af95469201985b918b77fc5011863183644a7,Tests_passed,0.85334653571333,False -3,refs/heads/master,a927decebd50d02bff3f8c56ade565b98d0ecd4c,2380144cf35bc2c211874ac53db2d846fccffb97,6621980643544df2261bd874717839dd24b28324,,70,False,Tests_passed,096c2d7eb164a14db32edc1795fbcb2a0581b74bd48dd262c1a055d11919ad81,0.8457226084805848,True,5130a21901c613787b9283b8566df0875df8dfbbf369ba1c0fff23858649a88c,Tests_passed,0.8456949637123378,False -4,refs/heads/master,d6a31c5fece9a634b7829df08bd0afa0ef06b69a,4639361f062ee6455b88e31996743e300240e71e,4e959f00b9e3a80ea99486834b0ab164be663fdc,a parent is the base,17,False,Tests_passed,5aa2dd4621da7b6c16236ae4f421ba167863bc71abe916fb4756f3b5830dbfe5,0.8461919300272299,True,eda7ff9105f5b5526ffe4c43e4daf10a441d8ad3da01e76ca65e9573e9df456b,Tests_passed,0.8461919300272299,False -5,refs/heads/master,8b26b8c56130e60347f8f20c17c3eca14b601cc1,e454bdf3e3b7d02bb95ff8a58952e70cb97dd0f9,522254f7ceb5e390cbb0904d698cb6294e081ce2,a parent is the base,39,False,Tests_passed,309996fcf2f75fdb2c75ff984b937ef0168bf1837b872e864544149f927bb14d,0.8517759917033965,True,ca67a5201f9ee344350e60fcbf3145d37ba8b5f63655db51fb3a69f4f8f96ea0,Tests_passed,0.8517759917033965,False -6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,17831,True,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,0.7582322978692876,True,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,0.7173103413091169,False -7,refs/heads/master,5e11fc8e2c1f5763ff6e6b37d3e750e369af7c94,b42390b2d6279bf7c23580f0f4ac517cba448cd5,dee07e7edfb332efd5d5207660248f71e96a1a0e,,224,False,Tests_passed,eb24de92724a4a9cfded8b479cf21ee00bcbc24daa5032a4b5fb0504b2bea69a,0.7026750196517472,True,31f6c872c0080531d16ac6b7efa7bd842985c69c185ff53af558b61b4c6a329c,Tests_passed,0.7026750196517472,False -8,refs/heads/master,bce54f56a1da7332cabdec21b26e82cd899ce82b,16b6d6cd734326e55af96146ac89594c8ed1b233,ce422afbecd67144c1e8caceaa151f80d4f8a0cc,,1598,True,Tests_passed,a5e189b974c286e626dff96fe996698327301483890e32df62d647c7441e8b6c,0.7214297078008167,True,e2a15289f8f14272bff7f3d76f800272b4b6e16760d80acd562bbc787e406721,Tests_passed,0.7195962185547188,False -9,refs/heads/master,f238de6e66d3e5d03715aa88dccc660d0ab89318,03bd6bf2c9873b23344b31ca7c39524ad9ee5756,c824e9fabecc54d431d4c860b95a2ad13794556c,a parent is the base,54,False,Tests_passed,785747a7609141e6e381731036e1b1968b5b70b315cf80140e8af096727f6ee9,0.7211962001804384,True,04155e098016a45775f99c28abc6cf0ff0bfcdfce0265d4120fffab7993d5d40,Tests_passed,0.7212701612903226,False -10,refs/heads/master,a2a632bba203ee71191e71e11058726f2f030b00,345934e15e82c9cbffb5b297aab51ad105b9ad82,541f59d09b5232b68cda87ee2abba7c62d33ee32,,19,False,Tests_passed,a30b3c3d8e0b71e540c763f13d31dc4995c98abe5246092d7030f7ae8385518f,0.7205625319314851,True,c3ac9a40ed916d3170b18a54d6d1859bd665c137a26837a701936bf28679b550,Tests_passed,0.7205625319314851,False -11,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,26434,True,Git_checkout_failed,,,False,6a26b8452ea8957e10c32b00e3a4232a42a8a2189f106759b926ec0d968d116b,Tests_passed,0.8538166355527899,False -12,refs/remotes/origin/pull/49,073c34351663673f4b53142bacf75033706e067f,64847e218c67593c77b0ebdefc93b5e7b4c82406,e80bea970d0b1a4ee340641f01b30b09f816eaa2,,28491,True,Git_checkout_failed,,,False,db1bbb783df46c51866457b8a4c7a2365225682a680b961c9bbffcd419fb5838,Tests_passed,0.8492908269723463,False +idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge +1,refs/heads/master,0637f5fc19cf6ad79cd2c58981facc3678d5bbff,b8b0b0c8e1dff237975942022a42c6c25b9d9741,3c10bf587f097be3e2a77b0d2d556e6f9efd97b1,,77,False,e677696d99009543543b67e43376936df48da7710eff36c66a37d4eaa1fc98e5,Tests_passed,0.8535777267140491,True,d187f1c73849a223e794329f88807bf76f60a16041876a0896846dbce5bb1861,Tests_passed,0.853562075784298,False +2,refs/heads/master,633e9c677f26c1cae476d9ce43331cc30bd8f9e8,af63ebf1a441d0165bab7f6250caf0e2793b9829,22631a4817aa29b231919cb5d8c05d935386b763,a parent is the base,17,False,f598d3120ef68309ed315a47e98d429cc60c53fa77a4189f6e8a43dfdf55fa25,Tests_passed,0.85334653571333,True,9e86790517ce177c1a909da94e1af95469201985b918b77fc5011863183644a7,Tests_passed,0.85334653571333,False +3,refs/heads/master,a927decebd50d02bff3f8c56ade565b98d0ecd4c,2380144cf35bc2c211874ac53db2d846fccffb97,6621980643544df2261bd874717839dd24b28324,,70,False,096c2d7eb164a14db32edc1795fbcb2a0581b74bd48dd262c1a055d11919ad81,Tests_passed,0.8457226084805848,True,5130a21901c613787b9283b8566df0875df8dfbbf369ba1c0fff23858649a88c,Tests_passed,0.8456949637123378,False +4,refs/heads/master,d6a31c5fece9a634b7829df08bd0afa0ef06b69a,4639361f062ee6455b88e31996743e300240e71e,4e959f00b9e3a80ea99486834b0ab164be663fdc,a parent is the base,17,False,5aa2dd4621da7b6c16236ae4f421ba167863bc71abe916fb4756f3b5830dbfe5,Tests_passed,0.8461919300272299,True,eda7ff9105f5b5526ffe4c43e4daf10a441d8ad3da01e76ca65e9573e9df456b,Tests_passed,0.8461919300272299,False +5,refs/heads/master,8b26b8c56130e60347f8f20c17c3eca14b601cc1,e454bdf3e3b7d02bb95ff8a58952e70cb97dd0f9,522254f7ceb5e390cbb0904d698cb6294e081ce2,a parent is the base,39,False,309996fcf2f75fdb2c75ff984b937ef0168bf1837b872e864544149f927bb14d,Tests_passed,0.8517759917033965,True,ca67a5201f9ee344350e60fcbf3145d37ba8b5f63655db51fb3a69f4f8f96ea0,Tests_passed,0.8517759917033965,False +6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,17831,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,0.7582322978692876,True,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,0.7173103413091169,False +7,refs/heads/master,5e11fc8e2c1f5763ff6e6b37d3e750e369af7c94,b42390b2d6279bf7c23580f0f4ac517cba448cd5,dee07e7edfb332efd5d5207660248f71e96a1a0e,,224,False,eb24de92724a4a9cfded8b479cf21ee00bcbc24daa5032a4b5fb0504b2bea69a,Tests_passed,0.7026750196517472,True,31f6c872c0080531d16ac6b7efa7bd842985c69c185ff53af558b61b4c6a329c,Tests_passed,0.7026750196517472,False +8,refs/heads/master,bce54f56a1da7332cabdec21b26e82cd899ce82b,16b6d6cd734326e55af96146ac89594c8ed1b233,ce422afbecd67144c1e8caceaa151f80d4f8a0cc,,1598,True,a5e189b974c286e626dff96fe996698327301483890e32df62d647c7441e8b6c,Tests_passed,0.7214297078008167,True,e2a15289f8f14272bff7f3d76f800272b4b6e16760d80acd562bbc787e406721,Tests_passed,0.7195962185547188,False +9,refs/heads/master,f238de6e66d3e5d03715aa88dccc660d0ab89318,03bd6bf2c9873b23344b31ca7c39524ad9ee5756,c824e9fabecc54d431d4c860b95a2ad13794556c,a parent is the base,54,False,785747a7609141e6e381731036e1b1968b5b70b315cf80140e8af096727f6ee9,Tests_passed,0.7211962001804384,True,04155e098016a45775f99c28abc6cf0ff0bfcdfce0265d4120fffab7993d5d40,Tests_passed,0.7212701612903226,False +10,refs/heads/master,a2a632bba203ee71191e71e11058726f2f030b00,345934e15e82c9cbffb5b297aab51ad105b9ad82,541f59d09b5232b68cda87ee2abba7c62d33ee32,,19,False,a30b3c3d8e0b71e540c763f13d31dc4995c98abe5246092d7030f7ae8385518f,Tests_passed,0.7205625319314851,True,c3ac9a40ed916d3170b18a54d6d1859bd665c137a26837a701936bf28679b550,Tests_passed,0.7205625319314851,False +11,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,2912,True,d2932153aaceea3e3dd8b0a3695a3f512d061b5befb7d373730b4e7254322c5a,Tests_passed,0.851034045587808,True,6a26b8452ea8957e10c32b00e3a4232a42a8a2189f106759b926ec0d968d116b,Tests_passed,0.8538166355527899,True +12,refs/remotes/origin/pull/49,073c34351663673f4b53142bacf75033706e067f,64847e218c67593c77b0ebdefc93b5e7b4c82406,e80bea970d0b1a4ee340641f01b30b09f816eaa2,,5056,True,18b82ff99b0bd4a72b59223148fe1e79e9e84ee01e9afe00a392268db041d821,Tests_passed,0.7594220063958309,True,db1bbb783df46c51866457b8a4c7a2365225682a680b961c9bbffcd419fb5838,Tests_passed,0.8492908269723463,False diff --git a/test/small-goal-files/merges_tested/JSCover.csv b/test/small-goal-files/merges_tested/JSCover.csv index c747b9116b..81b53a3186 100644 --- a/test/small-goal-files/merges_tested/JSCover.csv +++ b/test/small-goal-files/merges_tested/JSCover.csv @@ -1,3 +1,3 @@ idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge,left test result,right test result,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,e465e8275091cf468e4cf6fc70d89656f57cf4c656af0456a11cdf6af3253bbf,Tests_passed,0.8737521514629948,True,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,0.8754104026265768,True,Tests_passed,Tests_passed,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9 -14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,936bf008baece42fc21caaa7a4376675ff4566d092d9f204630d7a18ec8c5a60,Tests_passed,0.8512629399585921,True,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,0.8373498208388955,True,Tests_passed,Tests_passed,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2 +6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,4bccbf9668aee7cb98f69f5e6e81091dde91ae8b64b4e431f07dd54defffe88b,Tests_passed,0.8737521514629948,True,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,0.8754104026265768,True,Tests_passed,Tests_passed,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20 +14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,fc9694841d9bbd7893909fa2aacdf185ed91efba26c927eb0300071bc31e8e45,Tests_passed,0.8512629399585921,True,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,0.8373498208388955,True,Tests_passed,Tests_passed,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b diff --git a/test/small-goal-files/merges_tested/ez-vcard.csv b/test/small-goal-files/merges_tested/ez-vcard.csv index 715a6426e0..7e6f672438 100644 --- a/test/small-goal-files/merges_tested/ez-vcard.csv +++ b/test/small-goal-files/merges_tested/ez-vcard.csv @@ -1 +1,2 @@ -idx +idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge,left test result,right test result,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint +11,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,2912,True,d2932153aaceea3e3dd8b0a3695a3f512d061b5befb7d373730b4e7254322c5a,Tests_passed,0.851034045587808,True,6a26b8452ea8957e10c32b00e3a4232a42a8a2189f106759b926ec0d968d116b,Tests_passed,0.8538166355527899,True,Tests_passed,Tests_passed,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a diff --git a/test/small-goal-files/tables/all/table_feature_main_summary.tex b/test/small-goal-files/tables/all/table_feature_main_summary.tex index 87f16d6835..e92f03c004 100644 --- a/test/small-goal-files/tables/all/table_feature_main_summary.tex +++ b/test/small-goal-files/tables/all/table_feature_main_summary.tex @@ -13,18 +13,18 @@ \multicolumn{2}{c}{Feature Branch} \\ \hline & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\ - Gitmerge-ort & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-ort-adjacent & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-ort-ignorespace & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-ort-imports & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-ort-imports-ignorespace & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-resolve & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-recursive-histogram & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-recursive-ignorespace & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-recursive-minimal & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-recursive-myers & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Gitmerge-recursive-patience & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Git-hires-merge & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - Spork & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ - IntelliMerge & 2 & 100\% & 0 & -1\% & 0 & 0\% & 0 & -1\% & 0 & 0\% & 0 & -1\% \\ + Gitmerge-ort & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-ort-adjacent & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-ort-ignorespace & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-ort-imports & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-ort-imports-ignorespace & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-resolve & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-recursive-histogram & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-recursive-ignorespace & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-recursive-minimal & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-recursive-myers & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Gitmerge-recursive-patience & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Git-hires-merge & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + Spork & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ + IntelliMerge & 2 & 100\% & 1 & 100\% & 0 & 0\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ \end{tabular} diff --git a/test/small-goal-files/tables/all/table_summary.tex b/test/small-goal-files/tables/all/table_summary.tex index a725b61f11..319c1b3b5f 100644 --- a/test/small-goal-files/tables/all/table_summary.tex +++ b/test/small-goal-files/tables/all/table_summary.tex @@ -6,18 +6,18 @@ \multicolumn{2}{c}{Incorrect Merges} \\ & \# & \% & \# & \% & \# & \% \\ \hline -Gitmerge-ort & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-ort-adjacent & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-ort-ignorespace & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-ort-imports & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-ort-imports-ignorespace & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-resolve & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-recursive-histogram & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-recursive-ignorespace & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-recursive-minimal & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-recursive-myers & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Gitmerge-recursive-patience & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Git-hires-merge & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -Spork & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -IntelliMerge & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-ort & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-ort-adjacent & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-ort-ignorespace & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-ort-imports & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-ort-imports-ignorespace & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-resolve & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-recursive-histogram & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-recursive-ignorespace & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-recursive-minimal & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-recursive-myers & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Gitmerge-recursive-patience & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Git-hires-merge & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +Spork & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ +IntelliMerge & 3 & 100\% & 0 & 0\% & 0 & 0\% \\ \end{tabular} From bf878f8e2d0c0e19bb4e3af84c7b44c829d8f7f9 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 31 Oct 2023 16:27:28 -0700 Subject: [PATCH 15/20] Use LC_ALL instead of LC_COLLATE --- src/python/repo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/repo.py b/src/python/repo.py index aaf562b032..009f546cf8 100755 --- a/src/python/repo.py +++ b/src/python/repo.py @@ -408,7 +408,7 @@ def compute_tree_fingerprint(self) -> str: """ assert self.repo_path.exists() command = ( - "sha256sum <(export LC_COLLATE=C; cd " + "sha256sum <(export LC_ALL=C; cd " + str(self.repo_path) + " ;find . -type f -not -path '*/\\.git*' -exec sha256sum {} \\; | sort)" ) From 78daf1225667d777d6586c1f9c8020148396f8a6 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 31 Oct 2023 16:38:40 -0700 Subject: [PATCH 16/20] Set both variables --- src/python/repo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/repo.py b/src/python/repo.py index 009f546cf8..adf2e58c20 100755 --- a/src/python/repo.py +++ b/src/python/repo.py @@ -408,7 +408,7 @@ def compute_tree_fingerprint(self) -> str: """ assert self.repo_path.exists() command = ( - "sha256sum <(export LC_ALL=C; cd " + "sha256sum <(export export LC_ALL=C; LC_COLLATE=C; cd " + str(self.repo_path) + " ;find . -type f -not -path '*/\\.git*' -exec sha256sum {} \\; | sort)" ) From 988ab2ce1445756532bf29341beeb1492d281602 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 31 Oct 2023 16:51:13 -0700 Subject: [PATCH 17/20] Remove diagnostic output --- src/python/repo.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/python/repo.py b/src/python/repo.py index 4c35879a5b..adf2e58c20 100755 --- a/src/python/repo.py +++ b/src/python/repo.py @@ -417,7 +417,6 @@ def compute_tree_fingerprint(self) -> str: .decode("utf-8") .split()[0] ) - print("fingerprint of", str(self.repo_path), "=", result) return result def get_sha_cache_entry( From 8c9decaa6a37850a521a4034d14aa9d6d1b06845 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 31 Oct 2023 16:52:52 -0700 Subject: [PATCH 18/20] Revert test SHA changes --- .../merges_analyzed/JSCover.csv | 52 +++++++++---------- .../merges_tested/JSCover.csv | 4 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/test/small-goal-files/merges_analyzed/JSCover.csv b/test/small-goal-files/merges_analyzed/JSCover.csv index 8b776526cd..c662f4f4da 100644 --- a/test/small-goal-files/merges_analyzed/JSCover.csv +++ b/test/small-goal-files/merges_analyzed/JSCover.csv @@ -1,28 +1,28 @@ idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge -1,refs/heads/master,31361bbe2317967a9c47cfc4437e2ce706f79056,fe64f8c1071a356027e49247fd506edc23566c4d,ab9b573de54d1014b5d9822adc9d9e5cf43ba8c0,,158,False,715e031985dc349a5c57d483c366ba67a6790bb4628ca7e1b5c4588fd3f3f2fd,Tests_passed,0.8745331673483906,True,b2c4f64ddfab2c310b5360e0b9ffe73b34c7e0cbb70a97039869c30444f61190,Tests_passed,0.8745331673483906,False -2,refs/heads/master,fe64f8c1071a356027e49247fd506edc23566c4d,b9ead12fd4a28a9fd7074ad4e97128943b072828,f5cb9ece38b7bd9ae97d7a55490476b84a2336df,a parent is the base,148,False,06e1fad45b4b77a2e935f01b720a029c937b189f73c833d0015bc67aaecf59aa,Tests_passed,0.8757646247953821,True,715e031985dc349a5c57d483c366ba67a6790bb4628ca7e1b5c4588fd3f3f2fd,Tests_passed,0.8745331673483906,False -3,refs/heads/master,d6f0d1998a8db93117ba9c261d3b35d03633dc59,0eca5983951641b5d0884e6ce8fd162185d0cf05,d686e46aa0582b7dbee1f0d8664d6cb4b56600ec,a parent is the base,82,False,cddd0a5fa49c1198d3e74d40a62698b9f1687425be8729d2fc84ffc83eccff01,Tests_passed,0.8745331673483906,True,7b61baf907db4318721366736669e75431a74be63ca66832a42416bb5445509d,Tests_passed,0.8757646247953821,False -4,refs/heads/master,f7a4cc17c3b97f600f5a982522100d2b0200a981,f3876ebe83363de9387bba9ec14d436e2d74d2b3,f59722bd1d3dcbf9fc183a49ee0e28ea3c42edf8,a parent is the base,82,False,78830dbad0e02d5258bc5c1bc0108a98815adc86dcb5a4bf0c97f35abef2d7a2,Tests_passed,0.8755287009063444,True,51a2a2041f3f65c06e27fe783bde12355a5bbddeaf1f1d1a69ed8c0d56dbc942,Tests_passed,0.8742872416250891,False -5,refs/heads/master,526eaed4a82ee4ec9bb018e6d541c848d2bfdd0d,1adf11c82653576753af0502bfc1f63900d85780,e562b7ed71187c95e310f85e99d1325dbd49e331,a parent is the base,19,False,964af80685b0240a0644adcd374f4d42335ad6c8b5333929afd7c6ff1faa9ddb,Tests_passed,0.8754104026265768,True,53d259c5247895bba693098f567a012aca447cd617b8d6d5c8c109cfa041fa60,Tests_passed,0.8754104026265768,False -6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,4bccbf9668aee7cb98f69f5e6e81091dde91ae8b64b4e431f07dd54defffe88b,Tests_passed,0.8737521514629948,True,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,0.8754104026265768,True -7,refs/heads/master,5dc4fe25315e31fb1d6c3f58d802283634b6e37b,428706a429ed1a3dca09588e989597fd9a9cb673,26335cfc92a5aaa2df829c7ba52ac834ad1c4080,a parent is the base,122,False,4bccbf9668aee7cb98f69f5e6e81091dde91ae8b64b4e431f07dd54defffe88b,Tests_passed,0.8737521514629948,True,2cf5ccb962566884eac7c092960a9302e7f98414f0f821f4d72093df57bc00a2,Tests_passed,0.8753781004234725,False -8,refs/heads/master,9572ad5cfd2f4c20700e27f16c9e906e009d7137,c92c401a4335465b77e3bf95c47a3297fa633b5c,62d33c1ccc686ed687d04c8e874f0c36bbcfc43e,a parent is the base,17,False,122fea14fc8885146e62e4aed3ad3b4b0777b15cf8aacbf9acd29abec4defd59,Tests_passed,0.8737521514629948,True,a8c523fb08b16b8fa1677739fb09c4df7e05cc4901d3f7e8a2f5eeec461d6410,Tests_passed,0.8737521514629948,False -9,refs/heads/master,9ed0dc2b5892b2b2a782435b0a5dd42f90737b97,4ba5c58dfb6bf266259b80ab2fe19057910b6dba,7d6f336981e2d3c0a3e81fc663b6e4590f8aab0b,a parent is the base,13,False,a214977d479d2e086767d18512525684867933d65acdd3e2b8cab40359532251,Tests_passed,0.8739040742650851,True,a214977d479d2e086767d18512525684867933d65acdd3e2b8cab40359532251,Tests_passed,0.8739040742650851,False -10,refs/heads/master,c5bb794c4ca20c492818cdc13d4c72ad57961835,d709ecd47d92508d22f60e288fbe49b36f4b5246,9539280c2e350f6104b01c366ad8557e174f46da,a parent is the base,22,False,1c45199e7349fab49628a13532ecc8737c71f3b1d6be1d69afdd7041b5f988ed,Tests_passed,0.8739040742650851,True,29d8f8b8789c968de5fd0f6bb25a48df01efb0e2122a052f65ac128624c4b34b,Tests_passed,0.8739040742650851,False -11,refs/heads/master,58557bba03e3cd911b334f451d7bf20c84d54045,0eee54986010067c05972426937c3459b979a840,a4fb3645a032633128f78786d779101b46a16581,a parent is the base,93,False,38db326a5b5974ec97a1b34b406509b8744db5cbc0eb36a4f889e50338a4d81f,Tests_passed,0.8739040742650851,True,4f0e2e141ca9c89e490c6d794a4eb07e1ad953409b1bccfb2931476faea80c20,Tests_passed,0.8739040742650851,False -12,refs/heads/master,5c0f3bc432afa70ae19ced28fd4655effffa643f,bf98af8c6a8559d82a24d8f6f11d5fc23d29523e,f04fe03a282ca2520de93a3f13fe4c06146e5823,a parent is the base,39,False,e5fefe0c9436e9de7b32df10c8ddb8338f9cd8c085db5b93dc63a8dbefffad2e,Tests_passed,0.8715872879166308,True,ede66278232be08b58054711aaffd9a1d736f1fa9b2ee35b23ae1b08beee6089,Tests_passed,0.8715872879166308,False -13,refs/heads/master,885ba1e858932e9715e9b27a722a129e2611caab,c5f2600a6830cb2fc14647c98a9038832d20677f,48ce23c6b5857dd37a5658eb544fad390a4e3d44,a parent is the base,153,False,f483830f52dc91ef538393e96be09cc1a5709922c615c4ee9193748b9fa0b8c1,Tests_passed,0.8713033012379643,True,5ef2f6d4786500e797c69026fb9b95a35d917d2750092cda39ec5d6fe1423686,Tests_passed,0.8711645896003438,False -14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,fc9694841d9bbd7893909fa2aacdf185ed91efba26c927eb0300071bc31e8e45,Tests_passed,0.8512629399585921,True,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,0.8373498208388955,True -15,refs/heads/master,89ffb42fa4b9efa275282cd90369be4423441a94,5a3b21b0db2cbc45f1dccbeae832654c4b5c812e,b8d19bf433f60c02f28d046702a1ea86a157ecf6,a parent is the base,21,False,2fee0fcdcdbaf0e8c0c562d97b23b6caba3ca06667aee2a28ddb5418a070cc8d,Tests_passed,0.8502704952143154,True,aaec44b3ebf18120f3f56f2f8f8616c4aaf1ea6447e8f6d81749532c4d7200d6,Tests_passed,0.8498461026536894,False -16,refs/heads/master,c4db946b2d372f8bde079792b1cee93ac36921d2,3d76e008055d175af8fdbb90d6c5a0ced62faf0d,4534140b2526b36b39bcdf6d417d977db7a5cb1a,a parent is the base,23,False,0ab8c56a6f2fc108120ca5200af33de2e040f0e01e3dd7cafb12ddd86260122a,Tests_passed,0.8336750155985382,True,f8bd5756d4f6627da7db688b71caedc2046be235a2b989ea00e9285bd7c1d80c,Tests_passed,0.8336750155985382,False -17,refs/heads/master,ea0851ac5e27d2a1a13acd2110094c46c44a849e,c0603903e4b5caeb83d2c93ceabba1e9ea59af19,e405a7f2926be3103a388e990701af1f260bc905,,278,False,7b87079363898b197c3360066cba3e86bc4a427ee3800eb12308821cc3e0b451,Tests_passed,0.827537386072029,True,54db670b391ca0079213b9eb2d0f7d5fff2bfd1929dbed30081abde8376c9861,Tests_passed,0.8335267339105596,False -18,refs/heads/master,2a9f0eb4e7a59587ef0fb8a9312ba5edf0078145,92d6114663b80b24d1f9bb6d282138cf6094857e,b9a2ee7526cf561aa2ff511fe9872792bd315e91,,338,False,38afb55b7289c9f37e383c56c9ca2d9cef23871951e968d060443f689d045733,Tests_passed,0.8131766447672805,True,ad10c383815d726b821c60aeb74b809230740f7e8a2089725254e7e1086dbb83,Tests_passed,0.8131766447672805,False -19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,212,False,7399f66c107b3e5c2838845e83b790e46dbf8ae6fc1feca4ee34a35b5f4249ce,Tests_passed,0.8075090527920716,True,12399cc55a33548baba7235102ee7df63eaf3bd09ed103f00450507479d1c360,Tests_passed,0.811941132637854,False -20,refs/heads/master,10f916b7a0fd5953ae6f684cadd28fa87e9124e4,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,0256cc6b3b9f9470458ff418e6648c635c20e787,,142,False,a5e2d730e3024af1886e4f02c30ef98cd630c79b464b7da98b96f8bb87498daa,Tests_failed,0.0,False,c8581044c504f9271a332b396506c545166320853cc5c552f5138c66f985d4ed,Tests_passed,0.8075090527920716,False -21,refs/heads/master,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,b9f47e216af0bc46830e0cb0c6964218511bbb3f,974ce1770dc602051b320619e240603cc5358d64,,2624,True,7f5c0a16df1c4200347e44c5a7d409c4e9a810182ab25672c3f8b50381cfdc30,Tests_passed,0.8075090527920716,False,bfc219ca0655ff22f0000037f28c10aa662beb1f2df86b79bd83f791928be6b5,Tests_failed,0.0,False -22,refs/heads/master,00c10a4e7f42a484209a443934c833c5970f462f,8e0ad29ac0d484db3eccc4bee791b72cc6222e4c,530d40378d2d17276f71b18f871637fea2937ecf,,31,False,84564edff80f8e5668e1d11eea9b1c823fa8304351511abc275529e61f229eaa,Tests_failed,0.0,False,90729dfe383a1160a5daba76fafe9f272825abae2c66dd399a98655277133a59,Tests_failed,0.0,False -23,refs/heads/master,adf6fd024df05daf3236ce42e8cd90b5e4448131,dca3e3596b0b880e9eb4406490488ce93bc9116a,0575f5e918deec26aba2eb2a18f0e87af679d81b,a parent is the base,22,False,4b770b26ad5313b26033b8d4ffb0d045d7ac3575b4159b844b9d073d0c264ef7,Tests_failed,0.0,False,d9e5cfdc8e9d36073389f6aa84627cb6729c2a377eeafa4b27cf081428cf1391,Tests_failed,0.0,False -24,refs/heads/master,3ae921c45ac9a68844bbdc1d53a8a7ca262fb6b7,8fb1d13ac9c28ccf9723a4328141816f224337b9,aec694fe670b35eb827c473f5fbaf205cd59a0ba,,6542,False,12b9414de4aaf7c7c912fbd7509698016c37c66e7ef644c464d43aaaba2d634b,Tests_failed,0.0,False,c11ed1b8de207e534a9767c5b72fef2a66c5519a65ec3723d67948a83e5d2a0f,Tests_failed,0.0,False -25,refs/heads/master,ac65c8f97187f99331093624c7829d3688a50297,fb4312ddbbf301484ff0e1243cfdf12d6a2fb840,c8937ebc236d924201af98021a50091ab0ee013a,,129,True,b993f4d701fd4132bfcfa5bdd11b897b4ba3b11471f846c0bb756c73dd4be639,Tests_failed,0.0,False,0603d0eab8bf807519e292eccc4a7e6fe94e2f590219ac6b5bd1e84f9347ed27,Tests_failed,0.0,False +1,refs/heads/master,31361bbe2317967a9c47cfc4437e2ce706f79056,fe64f8c1071a356027e49247fd506edc23566c4d,ab9b573de54d1014b5d9822adc9d9e5cf43ba8c0,,158,False,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Tests_passed,0.8745331673483906,True,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Tests_passed,0.8745331673483906,False +2,refs/heads/master,fe64f8c1071a356027e49247fd506edc23566c4d,b9ead12fd4a28a9fd7074ad4e97128943b072828,f5cb9ece38b7bd9ae97d7a55490476b84a2336df,a parent is the base,148,False,5ff8c7cbf214a58896dbca33fafb6940f2a6e19222f5b69d5660ebcf7a63b615,Tests_passed,0.8757646247953821,True,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Tests_passed,0.8745331673483906,False +3,refs/heads/master,d6f0d1998a8db93117ba9c261d3b35d03633dc59,0eca5983951641b5d0884e6ce8fd162185d0cf05,d686e46aa0582b7dbee1f0d8664d6cb4b56600ec,a parent is the base,82,False,81fad259714fc7be34c891dcd38697dfcea66a688f159860ad3fc0bc3d7b2c8f,Tests_passed,0.8745331673483906,True,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Tests_passed,0.8757646247953821,False +4,refs/heads/master,f7a4cc17c3b97f600f5a982522100d2b0200a981,f3876ebe83363de9387bba9ec14d436e2d74d2b3,f59722bd1d3dcbf9fc183a49ee0e28ea3c42edf8,a parent is the base,82,False,78a32d0357350b1739b621ff4f8297c4141adfe14964bf37d2cf8635f59896fb,Tests_passed,0.8755287009063444,True,6766d3d6247010a11c2027986e97bce770780e18e2c5e486c70fdd0a06cbafc2,Tests_passed,0.8742872416250891,False +5,refs/heads/master,526eaed4a82ee4ec9bb018e6d541c848d2bfdd0d,1adf11c82653576753af0502bfc1f63900d85780,e562b7ed71187c95e310f85e99d1325dbd49e331,a parent is the base,19,False,c3e9263c4984dafd99b3c3cdb5569e1483f9d59e43cb5e170379467344b3b56e,Tests_passed,0.8754104026265768,True,6508da794aaedfae6ba4b9e1e118932e972cb44c30bb32e8ad80ca5d0146d031,Tests_passed,0.8754104026265768,False +6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,e465e8275091cf468e4cf6fc70d89656f57cf4c656af0456a11cdf6af3253bbf,Tests_passed,0.8737521514629948,True,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,0.8754104026265768,True +7,refs/heads/master,5dc4fe25315e31fb1d6c3f58d802283634b6e37b,428706a429ed1a3dca09588e989597fd9a9cb673,26335cfc92a5aaa2df829c7ba52ac834ad1c4080,a parent is the base,122,False,e465e8275091cf468e4cf6fc70d89656f57cf4c656af0456a11cdf6af3253bbf,Tests_passed,0.8737521514629948,True,9cb10c7a18b0827515c8962feb0def246396ff1e9639975ab6a17982de5aeff0,Tests_passed,0.8753781004234725,False +8,refs/heads/master,9572ad5cfd2f4c20700e27f16c9e906e009d7137,c92c401a4335465b77e3bf95c47a3297fa633b5c,62d33c1ccc686ed687d04c8e874f0c36bbcfc43e,a parent is the base,17,False,a7791741299b8249b12fa1ba78e65b8dd4fd990402e12848d267a380b7b0620d,Tests_passed,0.8737521514629948,True,a3ff762db463047ab939b44262e47e5416dc780cc291bbe2120d0baae0ef87d2,Tests_passed,0.8737521514629948,False +9,refs/heads/master,9ed0dc2b5892b2b2a782435b0a5dd42f90737b97,4ba5c58dfb6bf266259b80ab2fe19057910b6dba,7d6f336981e2d3c0a3e81fc663b6e4590f8aab0b,a parent is the base,13,False,297835fb2e58380a341e6e75e7c33c00186dfc4e0b7b31a69ebbf67e3ba57ceb,Tests_passed,0.8739040742650851,True,297835fb2e58380a341e6e75e7c33c00186dfc4e0b7b31a69ebbf67e3ba57ceb,Tests_passed,0.8739040742650851,False +10,refs/heads/master,c5bb794c4ca20c492818cdc13d4c72ad57961835,d709ecd47d92508d22f60e288fbe49b36f4b5246,9539280c2e350f6104b01c366ad8557e174f46da,a parent is the base,22,False,6b8077aa7e883faaacabd1c87129483e24bc3b52db05de57a06df208780de07b,Tests_passed,0.8739040742650851,True,8b354bb61ed97a8db7f9f0a150bffe0ef5171b897e9a21187c13c8e109a28ecd,Tests_passed,0.8739040742650851,False +11,refs/heads/master,58557bba03e3cd911b334f451d7bf20c84d54045,0eee54986010067c05972426937c3459b979a840,a4fb3645a032633128f78786d779101b46a16581,a parent is the base,93,False,43e509436145d7e7ce41d0af1132799d5736cfc2549853d5ebfa5a13fbc3ef2f,Tests_passed,0.8739040742650851,True,d06ed9ec6190c175d8152ed3a32c59391a1a803e3f2729772a47f053792eb59f,Tests_passed,0.8739040742650851,False +12,refs/heads/master,5c0f3bc432afa70ae19ced28fd4655effffa643f,bf98af8c6a8559d82a24d8f6f11d5fc23d29523e,f04fe03a282ca2520de93a3f13fe4c06146e5823,a parent is the base,39,False,b6f1f6b13aaa004c38203a67fe74af6d6860d049483e8ca72c7e9d1d7aeb98f3,Tests_passed,0.8715872879166308,True,959add4febe6be0d45c2a5a32cab88e6c865f7b17611c6e127ecad6196aa8c93,Tests_passed,0.8715872879166308,False +13,refs/heads/master,885ba1e858932e9715e9b27a722a129e2611caab,c5f2600a6830cb2fc14647c98a9038832d20677f,48ce23c6b5857dd37a5658eb544fad390a4e3d44,a parent is the base,153,False,85e3e158cd9ded526f17a94e53848374465b55c26cb1111bbbda2df4e57380c0,Tests_passed,0.8713033012379643,True,0e06d8883166791f016f1b8aa3b6a4da5219fcaf198108bf15a31f107c0fc174,Tests_passed,0.8711645896003438,False +14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,936bf008baece42fc21caaa7a4376675ff4566d092d9f204630d7a18ec8c5a60,Tests_passed,0.8512629399585921,True,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,0.8373498208388955,True +15,refs/heads/master,89ffb42fa4b9efa275282cd90369be4423441a94,5a3b21b0db2cbc45f1dccbeae832654c4b5c812e,b8d19bf433f60c02f28d046702a1ea86a157ecf6,a parent is the base,21,False,2d144af3fda0edc2e9c4e17b83452bbe9e7e8f9a6a9c61ebb835e4d05ec24562,Tests_passed,0.8502704952143154,True,92769bfef67a7395b495edffcf8458dbd8fa775b3d422da834d94d50c4e19169,Tests_passed,0.8498461026536894,False +16,refs/heads/master,c4db946b2d372f8bde079792b1cee93ac36921d2,3d76e008055d175af8fdbb90d6c5a0ced62faf0d,4534140b2526b36b39bcdf6d417d977db7a5cb1a,a parent is the base,23,False,e95f74676382558cef31d513281925fb07a8066d50abf814af1e1de9f85b6a64,Tests_passed,0.8336750155985382,True,37f54b1b5ddba375f0cdb6e11ea551ed9a4a3b42b8c86606332a983cd57cf7fd,Tests_passed,0.8336750155985382,False +17,refs/heads/master,ea0851ac5e27d2a1a13acd2110094c46c44a849e,c0603903e4b5caeb83d2c93ceabba1e9ea59af19,e405a7f2926be3103a388e990701af1f260bc905,,278,False,73fd788287e09d74fd3655ff96ae970dfdbef23a7c5edbf4d8a283fc9596366e,Tests_passed,0.827537386072029,True,18b06a4976504b391ab8b266d92762442a49f9ba0ce5fda9cc9a60c8c816f8d6,Tests_passed,0.8335267339105596,False +18,refs/heads/master,2a9f0eb4e7a59587ef0fb8a9312ba5edf0078145,92d6114663b80b24d1f9bb6d282138cf6094857e,b9a2ee7526cf561aa2ff511fe9872792bd315e91,,338,False,7eec20744772899894326be9b7de81f71f0f127d0a5573acabb8a826e2b858ad,Tests_passed,0.8131766447672805,True,bea0812d7548cfff42fa82c9a20e56b4b8038e296342bef04d3a07553d39ea1c,Tests_passed,0.8131766447672805,False +19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,212,False,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0.8075090527920716,True,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,0.811941132637854,False +20,refs/heads/master,10f916b7a0fd5953ae6f684cadd28fa87e9124e4,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,0256cc6b3b9f9470458ff418e6648c635c20e787,,142,False,7a7c00cd0ef7aa1e210f3600218a6e7b465c5ed22543a884fae1bfe485fd20d9,Tests_failed,0.0,False,cad6bb22e5482c4251c8f3cf3cdbf7f09f32a63d145064d53f9a309996a88e76,Tests_passed,0.8075090527920716,False +21,refs/heads/master,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,b9f47e216af0bc46830e0cb0c6964218511bbb3f,974ce1770dc602051b320619e240603cc5358d64,,2624,True,e18b3ba88cc7d565b615dd8623136da1d63630febebde162e2cffc54c842eb9e,Tests_passed,0.8075090527920716,False,04a326f5e41eef8b880988b9b468ada3cf2b34c550de24870f818d63952e637d,Tests_failed,0.0,False +22,refs/heads/master,00c10a4e7f42a484209a443934c833c5970f462f,8e0ad29ac0d484db3eccc4bee791b72cc6222e4c,530d40378d2d17276f71b18f871637fea2937ecf,,31,False,f92b72fcf3d326ca0fdc784bb1226153675afbf09fa9cbac29e0f8de9f9d4e48,Tests_failed,0.0,False,e6da00deaaa40d14d6a85237995176b78d9563e7e2470d23559f51d6768ebbae,Tests_failed,0.0,False +23,refs/heads/master,adf6fd024df05daf3236ce42e8cd90b5e4448131,dca3e3596b0b880e9eb4406490488ce93bc9116a,0575f5e918deec26aba2eb2a18f0e87af679d81b,a parent is the base,22,False,dbdc04f0b08acd21446fb431ce8df15954f4e80146f1bbc7555632256bf4e3bd,Tests_failed,0.0,False,4764cb2258749faad52f9aeaea6000072b3799ca436a09ae877075683f310505,Tests_failed,0.0,False +24,refs/heads/master,3ae921c45ac9a68844bbdc1d53a8a7ca262fb6b7,8fb1d13ac9c28ccf9723a4328141816f224337b9,aec694fe670b35eb827c473f5fbaf205cd59a0ba,,6542,False,bb4ed38dc2166762d5a373aa60d2d4930bc7e52d49b8c4b735d72c6a7f27017c,Tests_failed,0.0,False,876c70f3e5dc78debfb39901faa59e33bda1b28ae33baf60cfc5a7d6ae22eea2,Tests_failed,0.0,False +25,refs/heads/master,ac65c8f97187f99331093624c7829d3688a50297,fb4312ddbbf301484ff0e1243cfdf12d6a2fb840,c8937ebc236d924201af98021a50091ab0ee013a,,129,True,1df962e38d7eb57b4089203442b3adabd0fa69068107fc155e2689a12823efe2,Tests_failed,0.0,False,df60362dc02bda92c3989d190bbfeac4fbe5f648b0049001f2b6cb79b4b62c48,Tests_failed,0.0,False 26,refs/remotes/origin/gh-pages,9217160ed01a2bb7e57cd07001fc0da20135ad21,49868943e60fdb40de33c4416aae6a8517ef3d7f,bd0c5960622a73573c9fa5fb0f356ba575c3676c,a parent is the base,22,False,39bbf65e36cdcbd8db1f215dd86c51138d8cf200fc3b381b93331e8b278a4075,Tests_failed,0.0,False,65119fc78d1b2e903eeb86d7cbf83a3803785b5526d53c535a8b63e548720be5,Tests_failed,0.0,False -27,refs/remotes/origin/pull/94,c905e6a5da47ddf684d6cb6b6c52a6d5cb0d2e3b,390eb1dbfc709f2b75889697a9296ffeb06424a4,2e483d3cd3abbb5b6af28ea519278f597ccded96,,2027,True,fca7493914ed62d0b1ba68ec53d619a878dedf19ac5aa7ca6b4bf9d14eb27250,Tests_failed,0.0,False,2cd7b89dd6c234524014530be5aa0c9aa606c235eb41d96a01e37babd7cf066f,Tests_failed,0.0,False +27,refs/remotes/origin/pull/94,c905e6a5da47ddf684d6cb6b6c52a6d5cb0d2e3b,390eb1dbfc709f2b75889697a9296ffeb06424a4,2e483d3cd3abbb5b6af28ea519278f597ccded96,,2027,True,1c09a267f1c9a9fadc907ee6591ec27a3de2265d4d6b27f4fe6c91f7edff4aa6,Tests_failed,0.0,False,21c90bb9de31ea68ac17b0cb22d88ad5a1d668172ae43633e9cf5b0fdf5dd8eb,Tests_failed,0.0,False diff --git a/test/small-goal-files/merges_tested/JSCover.csv b/test/small-goal-files/merges_tested/JSCover.csv index 81b53a3186..c747b9116b 100644 --- a/test/small-goal-files/merges_tested/JSCover.csv +++ b/test/small-goal-files/merges_tested/JSCover.csv @@ -1,3 +1,3 @@ idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge,left test result,right test result,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,4bccbf9668aee7cb98f69f5e6e81091dde91ae8b64b4e431f07dd54defffe88b,Tests_passed,0.8737521514629948,True,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,0.8754104026265768,True,Tests_passed,Tests_passed,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20,Tests_passed,8cdd9f7fa2c93ce6121b9ca9206129aebfe30f8f394fb3780e5e2111d8176b20 -14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,fc9694841d9bbd7893909fa2aacdf185ed91efba26c927eb0300071bc31e8e45,Tests_passed,0.8512629399585921,True,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,0.8373498208388955,True,Tests_passed,Tests_passed,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b,Tests_passed,4e1d97bebf1aa942c72504e63503e55f104177ff1634dfd3c3283b5fa374648b +6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,e465e8275091cf468e4cf6fc70d89656f57cf4c656af0456a11cdf6af3253bbf,Tests_passed,0.8737521514629948,True,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,0.8754104026265768,True,Tests_passed,Tests_passed,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9 +14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,936bf008baece42fc21caaa7a4376675ff4566d092d9f204630d7a18ec8c5a60,Tests_passed,0.8512629399585921,True,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,0.8373498208388955,True,Tests_passed,Tests_passed,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2 From 608b7cbb85c259e8bfe30888d50e3b1f8aeeb85b Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 31 Oct 2023 17:01:57 -0700 Subject: [PATCH 19/20] Delete workdirs --- src/python/variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/variables.py b/src/python/variables.py index 338103cc03..ae064bae39 100644 --- a/src/python/variables.py +++ b/src/python/variables.py @@ -7,7 +7,7 @@ RIGHT_BRANCH_NAME = BRANCH_BASE_NAME + "_RIGHT" CACHE_BACKOFF_TIME = 2 * 60 # 2 minutes, in seconds -DELETE_WORKDIRS = False +DELETE_WORKDIRS = True REPOS_PATH = Path("repos") WORKDIR_DIRECTORY = Path( ".workdir" From 5cef78a989aea4c4bd5dc875d308a8588df28250 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 31 Oct 2023 17:39:04 -0700 Subject: [PATCH 20/20] Fix typo --- src/python/repo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/repo.py b/src/python/repo.py index adf2e58c20..acd5c7d789 100755 --- a/src/python/repo.py +++ b/src/python/repo.py @@ -408,7 +408,7 @@ def compute_tree_fingerprint(self) -> str: """ assert self.repo_path.exists() command = ( - "sha256sum <(export export LC_ALL=C; LC_COLLATE=C; cd " + "sha256sum <(export LC_ALL=C; export LC_COLLATE=C; cd " + str(self.repo_path) + " ;find . -type f -not -path '*/\\.git*' -exec sha256sum {} \\; | sort)" )