Skip to content

Commit

Permalink
ran analysis
Browse files Browse the repository at this point in the history 
ran analysis results in merge_conflict_analysis_diffs
  • Loading branch information
@cactusbranch01
cactusbranch01 committed Feb 18, 2024
1 parent a8910c4 commit 5cef4dc
Show file tree
Hide file tree
Showing 888 changed files with 252,696 additions and 27 deletions.
115 changes: 96 additions & 19 deletions src/python/diff3_analysis.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,105 @@
"cells": [
{
"cell_type": "code",
"execution_count": null,
"execution_count": 1,
"metadata": {},
"outputs": [],
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"fasterxml/jackson-core : Cloning repo\n",
"fasterxml/jackson-core : Finished cloning\n",
"fasterxml/jackson-core : Finished cloning\n",
"Checking out left294f761da4b185c997d6f19d0753711b702fe702\n",
"Checking out right2cd126e3f8cbf8fee29f7a21f6c0c5c34fa63344\n",
"Found base shaf554808f2285ab7fa68a7b830e33417712ce4a26\n",
"\n",
"fasterxml/jackson-core : Cloning repo\n",
"fasterxml/jackson-core : Finished cloning\n",
"fasterxml/jackson-core : Finished cloning\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
"Switched to branch 'TEMP_LEFT_BRANCH'\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Running: git merge --no-edit -s ort TEMP_RIGHT_BRANCH\n",
"Auto-merging pom.xml\n",
"CONFLICT (content): Merge conflict in pom.xml\n",
"Auto-merging release-notes/VERSION\n",
"CONFLICT (content): Merge conflict in release-notes/VERSION\n",
"Automatic merge failed; fix conflicts and then commit the result.\n",
"Conflict\n",
"\n",
"fasterxml/jackson-core : Cloning repo\n",
"fasterxml/jackson-core : Finished cloning\n",
"fasterxml/jackson-core : Finished cloning\n",
"Diff results saved to ./merge_conflict_analysis_diffs/809/gitmerge_ort/diff_pom.xml.txt\n",
"Diff results saved to ./merge_conflict_analysis_diffs/809/gitmerge_ort/diff_VERSION.txt\n",
"fasterxml/jackson-core : Cloning repo\n",
"fasterxml/jackson-core : Finished cloning\n"
]
},
{
"ename": "KeyboardInterrupt",
"evalue": "",
"output_type": "error",
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mKeyboardInterrupt\u001b[0m Traceback (most recent call last)",
"Cell \u001b[0;32mIn[1], line 31\u001b[0m\n\u001b[1;32m 29\u001b[0m repo_output_dir \u001b[38;5;241m=\u001b[39m os\u001b[38;5;241m.\u001b[39mpath\u001b[38;5;241m.\u001b[39mjoin(base_output_dir, \u001b[38;5;28mstr\u001b[39m(row_num), merge_tool)\n\u001b[1;32m 30\u001b[0m os\u001b[38;5;241m.\u001b[39mmakedirs(repo_output_dir, exist_ok\u001b[38;5;241m=\u001b[39m\u001b[38;5;28;01mTrue\u001b[39;00m)\n\u001b[0;32m---> 31\u001b[0m \u001b[43mdiff3_analysis\u001b[49m\u001b[43m(\u001b[49m\u001b[43mmerge_tool\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mrow_num\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mrepo_output_dir\u001b[49m\u001b[43m)\u001b[49m\n",
"File \u001b[0;32m~/Documents/GitHub/AST-Merging-Ben-Analysis/src/python/diff3_analysis.py:38\u001b[0m, in \u001b[0;36mdiff3_analysis\u001b[0;34m(merge_tool, results_index, repo_output_dir)\u001b[0m\n\u001b[1;32m 35\u001b[0m repo_name \u001b[38;5;241m=\u001b[39m df\u001b[38;5;241m.\u001b[39miloc[results_index][\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mrepository\u001b[39m\u001b[38;5;124m\"\u001b[39m]\n\u001b[1;32m 37\u001b[0m script \u001b[38;5;241m=\u001b[39m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124m../scripts/merge_tools/\u001b[39m\u001b[38;5;124m\"\u001b[39m \u001b[38;5;241m+\u001b[39m merge_tool \u001b[38;5;241m+\u001b[39m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124m.sh\u001b[39m\u001b[38;5;124m\"\u001b[39m\n\u001b[0;32m---> 38\u001b[0m repo \u001b[38;5;241m=\u001b[39m \u001b[43mclone_repo_to_path\u001b[49m\u001b[43m(\u001b[49m\n\u001b[1;32m 39\u001b[0m \u001b[43m \u001b[49m\u001b[43mrepo_name\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[38;5;124;43m\"\u001b[39;49m\u001b[38;5;124;43m./repos/merge_attempt\u001b[39;49m\u001b[38;5;124;43m\"\u001b[39;49m\n\u001b[1;32m 40\u001b[0m \u001b[43m\u001b[49m\u001b[43m)\u001b[49m \u001b[38;5;66;03m# Return a Git-Python repo object\u001b[39;00m\n\u001b[1;32m 41\u001b[0m repo\u001b[38;5;241m.\u001b[39mremote()\u001b[38;5;241m.\u001b[39mfetch()\n\u001b[1;32m 42\u001b[0m left_sha \u001b[38;5;241m=\u001b[39m df\u001b[38;5;241m.\u001b[39miloc[results_index][\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mleft\u001b[39m\u001b[38;5;124m\"\u001b[39m]\n",
"File \u001b[0;32m~/Documents/GitHub/AST-Merging-Ben-Analysis/src/python/repo.py:77\u001b[0m, in \u001b[0;36mclone_repo_to_path\u001b[0;34m(repo_slug, path)\u001b[0m\n\u001b[1;32m 75\u001b[0m \u001b[38;5;28mprint\u001b[39m(repo_slug, \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124m : Finished cloning\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[1;32m 76\u001b[0m \u001b[38;5;28;01mtry\u001b[39;00m:\n\u001b[0;32m---> 77\u001b[0m repo \u001b[38;5;241m=\u001b[39m \u001b[43mgit\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mrepo\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mRepo\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mclone_from\u001b[49m\u001b[43m(\u001b[49m\u001b[43mgithub_url\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mrepo_dir\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 78\u001b[0m \u001b[38;5;28mprint\u001b[39m(repo_slug, \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124m : Finished cloning\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[1;32m 79\u001b[0m repo\u001b[38;5;241m.\u001b[39mremote()\u001b[38;5;241m.\u001b[39mfetch()\n",
"File \u001b[0;32m~/miniconda/envs/research/lib/python3.8/site-packages/git/repo/base.py:1328\u001b[0m, in \u001b[0;36mRepo.clone_from\u001b[0;34m(cls, url, to_path, progress, env, multi_options, allow_unsafe_protocols, allow_unsafe_options, **kwargs)\u001b[0m\n\u001b[1;32m 1326\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m env \u001b[38;5;129;01mis\u001b[39;00m \u001b[38;5;129;01mnot\u001b[39;00m \u001b[38;5;28;01mNone\u001b[39;00m:\n\u001b[1;32m 1327\u001b[0m git\u001b[38;5;241m.\u001b[39mupdate_environment(\u001b[38;5;241m*\u001b[39m\u001b[38;5;241m*\u001b[39menv)\n\u001b[0;32m-> 1328\u001b[0m \u001b[38;5;28;01mreturn\u001b[39;00m \u001b[38;5;28;43mcls\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43m_clone\u001b[49m\u001b[43m(\u001b[49m\n\u001b[1;32m 1329\u001b[0m \u001b[43m \u001b[49m\u001b[43mgit\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1330\u001b[0m \u001b[43m \u001b[49m\u001b[43murl\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1331\u001b[0m \u001b[43m \u001b[49m\u001b[43mto_path\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1332\u001b[0m \u001b[43m \u001b[49m\u001b[43mGitCmdObjectDB\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1333\u001b[0m \u001b[43m \u001b[49m\u001b[43mprogress\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1334\u001b[0m \u001b[43m \u001b[49m\u001b[43mmulti_options\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1335\u001b[0m \u001b[43m \u001b[49m\u001b[43mallow_unsafe_protocols\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mallow_unsafe_protocols\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1336\u001b[0m \u001b[43m \u001b[49m\u001b[43mallow_unsafe_options\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mallow_unsafe_options\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1337\u001b[0m \u001b[43m \u001b[49m\u001b[38;5;241;43m*\u001b[39;49m\u001b[38;5;241;43m*\u001b[39;49m\u001b[43mkwargs\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1338\u001b[0m \u001b[43m\u001b[49m\u001b[43m)\u001b[49m\n",
"File \u001b[0;32m~/miniconda/envs/research/lib/python3.8/site-packages/git/repo/base.py:1232\u001b[0m, in \u001b[0;36mRepo._clone\u001b[0;34m(cls, git, url, path, odb_default_type, progress, multi_options, allow_unsafe_protocols, allow_unsafe_options, **kwargs)\u001b[0m\n\u001b[1;32m 1224\u001b[0m handle_process_output(\n\u001b[1;32m 1225\u001b[0m proc,\n\u001b[1;32m 1226\u001b[0m \u001b[38;5;28;01mNone\u001b[39;00m,\n\u001b[0;32m (...)\u001b[0m\n\u001b[1;32m 1229\u001b[0m decode_streams\u001b[38;5;241m=\u001b[39m\u001b[38;5;28;01mFalse\u001b[39;00m,\n\u001b[1;32m 1230\u001b[0m )\n\u001b[1;32m 1231\u001b[0m \u001b[38;5;28;01melse\u001b[39;00m:\n\u001b[0;32m-> 1232\u001b[0m (stdout, stderr) \u001b[38;5;241m=\u001b[39m \u001b[43mproc\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mcommunicate\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 1233\u001b[0m cmdline \u001b[38;5;241m=\u001b[39m \u001b[38;5;28mgetattr\u001b[39m(proc, \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124margs\u001b[39m\u001b[38;5;124m\"\u001b[39m, \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[1;32m 1234\u001b[0m cmdline \u001b[38;5;241m=\u001b[39m remove_password_if_present(cmdline)\n",
"File \u001b[0;32m~/miniconda/envs/research/lib/python3.8/subprocess.py:1028\u001b[0m, in \u001b[0;36mPopen.communicate\u001b[0;34m(self, input, timeout)\u001b[0m\n\u001b[1;32m 1025\u001b[0m endtime \u001b[38;5;241m=\u001b[39m \u001b[38;5;28;01mNone\u001b[39;00m\n\u001b[1;32m 1027\u001b[0m \u001b[38;5;28;01mtry\u001b[39;00m:\n\u001b[0;32m-> 1028\u001b[0m stdout, stderr \u001b[38;5;241m=\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43m_communicate\u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;28;43minput\u001b[39;49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mendtime\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mtimeout\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 1029\u001b[0m \u001b[38;5;28;01mexcept\u001b[39;00m \u001b[38;5;167;01mKeyboardInterrupt\u001b[39;00m:\n\u001b[1;32m 1030\u001b[0m \u001b[38;5;66;03m# https://bugs.python.org/issue25942\u001b[39;00m\n\u001b[1;32m 1031\u001b[0m \u001b[38;5;66;03m# See the detailed comment in .wait().\u001b[39;00m\n\u001b[1;32m 1032\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m timeout \u001b[38;5;129;01mis\u001b[39;00m \u001b[38;5;129;01mnot\u001b[39;00m \u001b[38;5;28;01mNone\u001b[39;00m:\n",
"File \u001b[0;32m~/miniconda/envs/research/lib/python3.8/subprocess.py:1884\u001b[0m, in \u001b[0;36mPopen._communicate\u001b[0;34m(self, input, endtime, orig_timeout)\u001b[0m\n\u001b[1;32m 1877\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39m_check_timeout(endtime, orig_timeout,\n\u001b[1;32m 1878\u001b[0m stdout, stderr,\n\u001b[1;32m 1879\u001b[0m skip_check_and_raise\u001b[38;5;241m=\u001b[39m\u001b[38;5;28;01mTrue\u001b[39;00m)\n\u001b[1;32m 1880\u001b[0m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mRuntimeError\u001b[39;00m( \u001b[38;5;66;03m# Impossible :)\u001b[39;00m\n\u001b[1;32m 1881\u001b[0m \u001b[38;5;124m'\u001b[39m\u001b[38;5;124m_check_timeout(..., skip_check_and_raise=True) \u001b[39m\u001b[38;5;124m'\u001b[39m\n\u001b[1;32m 1882\u001b[0m \u001b[38;5;124m'\u001b[39m\u001b[38;5;124mfailed to raise TimeoutExpired.\u001b[39m\u001b[38;5;124m'\u001b[39m)\n\u001b[0;32m-> 1884\u001b[0m ready \u001b[38;5;241m=\u001b[39m \u001b[43mselector\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mselect\u001b[49m\u001b[43m(\u001b[49m\u001b[43mtimeout\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 1885\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39m_check_timeout(endtime, orig_timeout, stdout, stderr)\n\u001b[1;32m 1887\u001b[0m \u001b[38;5;66;03m# XXX Rewrite these to use non-blocking I/O on the file\u001b[39;00m\n\u001b[1;32m 1888\u001b[0m \u001b[38;5;66;03m# objects; they are no longer using C stdio!\u001b[39;00m\n",
"File \u001b[0;32m~/miniconda/envs/research/lib/python3.8/selectors.py:415\u001b[0m, in \u001b[0;36m_PollLikeSelector.select\u001b[0;34m(self, timeout)\u001b[0m\n\u001b[1;32m 413\u001b[0m ready \u001b[38;5;241m=\u001b[39m []\n\u001b[1;32m 414\u001b[0m \u001b[38;5;28;01mtry\u001b[39;00m:\n\u001b[0;32m--> 415\u001b[0m fd_event_list \u001b[38;5;241m=\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43m_selector\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mpoll\u001b[49m\u001b[43m(\u001b[49m\u001b[43mtimeout\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 416\u001b[0m \u001b[38;5;28;01mexcept\u001b[39;00m \u001b[38;5;167;01mInterruptedError\u001b[39;00m:\n\u001b[1;32m 417\u001b[0m \u001b[38;5;28;01mreturn\u001b[39;00m ready\n",
"\u001b[0;31mKeyboardInterrupt\u001b[0m: "
]
}
],
"source": [
"row_num = 1444\n",
"merge_tool = \"gitmerge_ort\"\n",
"# merge_tool = \"gitmerge_ort_adjacent\"\n",
"# merge_tool = \"gitmerge_ort_ignorespace\"\n",
"# merge_tool = \"gitmerge_ort_imports\"\n",
"# merge_tool = \"gitmerge_ort_imports_ignorespace\"\n",
"# merge_tool = \"gitmerge_resolve\"\n",
"# merge_tool = \"gitmerge_recursive_histogram\"\n",
"# merge_tool = \"gitmerge_recursive_ignorespace\"\n",
"# merge_tool = \"gitmerge_recursive_minimal\"\t\n",
"# merge_tool = \"gitmerge_recursive_myers\"\n",
"# merge_tool = \"gitmerge_recursive_patience\"\n",
"# merge_tool = \"git_hires_merge\"\n",
"# merge_tool = \"spork\"\n",
"# merge_tool = \"intellimerge\"\n",
"\n",
"from diff3_analysis import diff3_analysis\n",
"diff3_analysis(merge_tool, row_num)"
"import os\n",
"\n",
"row_nums = [\n",
" 582, 427, 930, 70, 128, 1444, 1177, 849, 1425, 1642, 1897, 862, 943, 1442, 1120,\n",
" 111, 693, 535, 354, 530, 845, 654, 921, 464, 1006, 707, 485, 1928, 809, 1329, 65, 1890, 100, 247, 2038, 900\n",
"]\n",
"\n",
"merge_tools = [\"gitmerge_ort\", \n",
" \"gitmerge_ort_adjacent\", \n",
" \"gitmerge_ort_ignorespace\", \n",
" \"gitmerge_ort_imports\", \n",
" \"gitmerge_ort_imports_ignorespace\", \n",
" \"gitmerge_resolve\",\n",
" \"gitmerge_recursive_histogram\", \n",
" \"gitmerge_recursive_ignorespace\", \n",
" \"gitmerge_recursive_minimal\", \n",
" \"gitmerge_recursive_myers\", \n",
" \"gitmerge_recursive_patience\",\n",
" \"git_hires_merge\",\n",
" \"spork\", \n",
" \"intellimerge\"]\n",
"\n",
"# Ensure the base output directory exists\n",
"base_output_dir = \"./merge_conflict_analysis_diffs\"\n",
"\n",
"for row_num in row_nums:\n",
" for merge_tool in merge_tools:\n",
" # Create a subdirectory for this specific results_index\n",
" repo_output_dir = os.path.join(base_output_dir, str(row_num), merge_tool)\n",
" os.makedirs(repo_output_dir, exist_ok=True)\n",
" diff3_analysis(merge_tool, row_num, repo_output_dir)\n"
]
}
],
Expand Down
11 changes: 3 additions & 8 deletions src/python/diff3_analysis.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
# pylint: disable-msg=too-many-locals


def diff3_analysis(merge_tool: str, results_index: int):
def diff3_analysis(merge_tool: str, results_index: int, repo_output_dir):
"""
Analyzes merge conflicts using the diff3 tool and opens the results in the default text viewer.
Args:
merge_tool (str): The merge tool to be used.
results_index (int): The index of the repository in the results DataFrame.
repo_output_dir (path): The path of where we want to store the results from the analysis
Returns:
None
"""
Expand All @@ -29,12 +30,6 @@ def diff3_analysis(merge_tool: str, results_index: int):
# We do this to prevent errors if cloning the same repo into the folder twice
shutil.rmtree("./repos", ignore_errors=True)

# Ensure the base output directory exists
base_output_dir = "./merge_conflict_analysis_diffs"
# Create a subdirectory for this specific results_index
repo_output_dir = os.path.join(base_output_dir, f"index_{results_index}")
os.makedirs(repo_output_dir, exist_ok=True)

# Retrieve left and right branch from hash in repo
df = pd.read_csv("../../results_greatest_hits/result.csv")
repo_name = df.iloc[results_index]["repository"]
Expand Down
Loading

0 comments on commit 5cef4dc

Please sign in to comment.