Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added fix for intellimerge #297

Merged
merged 9 commits into from
May 27, 2024
Merged

Added fix for intellimerge #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0dc5a7a
Added fix for intellimerge
benedikt-schesch May 21, 2024
c476491
Added latest data
benedikt-schesch May 21, 2024
56fd0c2
Added latest data
benedikt-schesch May 24, 2024
86b4f5f
Added latest results
benedikt-schesch May 25, 2024
a5362e2
Added better deletion
benedikt-schesch May 26, 2024
e793ea9
Added latest data
benedikt-schesch May 27, 2024
b915f87
Faster reproducibility check
benedikt-schesch May 27, 2024
d3a848b
Fix style
benedikt-schesch May 27, 2024
fd8f36f
Ensure proper deletion in replay merge
benedikt-schesch May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 8 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ update-figures:
./run_greatest_hits.sh -op
./run_reaper.sh -op

run-all-without-timing:
${MAKE} clean-workdir
${MAKE} small-test-without-cleaning
./run_combined.sh --no_timing
./run_greatest_hits.sh --no_timing
./run_reaper.sh --no_timing

run-all:
${MAKE} clean-workdir
${MAKE} small-test-without-cleaning
Expand All @@ -134,7 +141,7 @@ clean-local:
check-merges-reproducibility:
@echo "Running replay_merge for each idx in parallel using GNU Parallel..."
@set -e; \
tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% python3 src/python/replay_merge.py --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx {}
tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% python3 src/python/replay_merge.py --testing --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx {}

protect-repos:
find repos -mindepth 1 -type d -exec chmod a-w {} +
Expand Down
16 changes: 8 additions & 8 deletions results/combined/defs.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
\def\combinedReposSampled{1120\xspace}
\def\combinedMergesSampled{6040\xspace}
\def\combinedReposYieldedFull{1\xspace}
\def\combinedReposTotal{1120\xspace}
\def\combinedMergesTotal{6040\xspace}
\def\combinedReposTotal{1100\xspace}
\def\combinedMergesTotal{5696\xspace}

% Results
\def\combinedSporkOverOrtCorrect{518\xspace}
\def\combinedSporkOverOrtIncorrect{487\xspace}
\def\combinedMainBranchMerges{3557\xspace}
\def\combinedMainBranchMergesPercent{59\xspace}
\def\combinedOtherBranchMerges{2483\xspace}
\def\combinedOtherBranchMergesPercent{41\xspace}
\def\combinedSporkOverOrtCorrect{499\xspace}
\def\combinedSporkOverOrtIncorrect{450\xspace}
\def\combinedMainBranchMerges{3399\xspace}
\def\combinedMainBranchMergesPercent{60\xspace}
\def\combinedOtherBranchMerges{2297\xspace}
\def\combinedOtherBranchMergesPercent{40\xspace}
\def\combinedReposJava{42092\xspace}

% Timeout
Expand Down
Binary file modified results/combined/merges_analyzer_histograms.pdf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions results/combined/merges_tested/47deg/firebrand.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_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,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,Tests_passed,True,True,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34
6,refs/heads/master,776567ef4e502d276d9b7f6a3c3ba70754fcabde,ece26b9bb6c5fcb3807dabf5810dce5a7e51cf05,ad5e18e5ce13fb70b20b15cbeb49c380c2049701,,True,True,7443331472584e853baa7fa5152c8a93e8438c566b4f91c905258a0637c94ff3,Tests_passed,212b451b1f4695b9de086e78bf02ef6d9af76b604e8dc0cab2ef61acaa552543,Tests_passed,True,True,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,ab1bd23ccd71385462ed94273ceda67a8a5d2ff5d0625e4739d8136ae584ccd2,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0
7,refs/heads/master,5af53e4af47a4f7638afa8520b08ef519e5042b3,9a06e785e8a0cffa134de02a602715b0cb50b9f8,1a4e908fd03df49084741bbd167328701826caae,,True,True,df81935bef53d48936e123ec5697943b83c1e2d1de2f1417989a85eccf5ded37,Tests_passed,07f6c21a1269399c043bed38e4cbd84111558717b8d10f1367ef0b06092bae3b,Tests_passed,True,True,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,af0ee49e18bdb6a7722bac9576e3c087445d5da94224ce3d7641f6dc266639a9,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615
6,refs/heads/master,776567ef4e502d276d9b7f6a3c3ba70754fcabde,ece26b9bb6c5fcb3807dabf5810dce5a7e51cf05,ad5e18e5ce13fb70b20b15cbeb49c380c2049701,,True,True,7443331472584e853baa7fa5152c8a93e8438c566b4f91c905258a0637c94ff3,Tests_passed,212b451b1f4695b9de086e78bf02ef6d9af76b604e8dc0cab2ef61acaa552543,Tests_passed,True,True,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,ab1bd23ccd71385462ed94273ceda67a8a5d2ff5d0625e4739d8136ae584ccd2,Tests_failed,90aeb11365dae7eeb07d4a6b03327ec36bad0247263d116d711e94667ab72eda
7,refs/heads/master,5af53e4af47a4f7638afa8520b08ef519e5042b3,9a06e785e8a0cffa134de02a602715b0cb50b9f8,1a4e908fd03df49084741bbd167328701826caae,,True,True,df81935bef53d48936e123ec5697943b83c1e2d1de2f1417989a85eccf5ded37,Tests_passed,07f6c21a1269399c043bed38e4cbd84111558717b8d10f1367ef0b06092bae3b,Tests_passed,True,True,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,af0ee49e18bdb6a7722bac9576e3c087445d5da94224ce3d7641f6dc266639a9,Tests_failed,ad5d380fdd0a4ef48084507e5859be952065705f53761383f767f3a968ff715b
Loading