Skip to content

Commit

Permalink
Merge stats (#330)
Browse files Browse the repository at this point in the history
  • Loading branch information
@benedikt-schesch
benedikt-schesch authored Aug 20, 2024
1 parent 9e5ac4f commit 1f98836
Show file tree
Hide file tree
Showing 5,065 changed files with 122,723 additions and 122,583 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ cache.tar
output.txt
replay_logs/
my.secrets
.nix/
.direnv/
.idea/
.envrc

repos-small-test
output/
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ To run style checking run `make style`.

* run_multiple_machine.sh -> Runs the full stack on multiple remote machines.

* diff_statistics.py -> Various diff commands to compare the results of two merges.

* src/main/java/astmergeevaluation/FindMergeCommits.java -> Finds all merge commits in a repo.

* input_data/ -> Input data, which is a list of repositories; see its README.md.
Expand Down
6 changes: 3 additions & 3 deletions results/combined/merges_analyzed/01org/graphbuilder.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_lines,test merge,sampled for testing
1,refs/remotes/origin/pull/2,34ad099f9deda4bca61c92b4bfa29e8179b77ba9,4aa0b8450b9beb637b550633b0e56352276f1836,ec9cdb514c3bc9a454bd183b3ff0588dfc2c5434,,False,True,True,24,3137,False,False
2,refs/remotes/origin/pull/2,4aa0b8450b9beb637b550633b0e56352276f1836,fb01619e4e99f20ad5f6dd7eed7d3dfe44e4375b,d633ba404308022cca0cebe7b905c2dae39494ee,,False,True,True,1434,69185,False,False
idx,branch_name,merge,left,right,notes,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,diff contains java file,imports_involved,non_java_involved,num_diff_files,test merge,sampled for testing
1,refs/remotes/origin/pull/2,34ad099f9deda4bca61c92b4bfa29e8179b77ba9,4aa0b8450b9beb637b550633b0e56352276f1836,ec9cdb514c3bc9a454bd183b3ff0588dfc2c5434,,24,2,4209,200,False,True,True,24,False,False
2,refs/remotes/origin/pull/2,4aa0b8450b9beb637b550633b0e56352276f1836,fb01619e4e99f20ad5f6dd7eed7d3dfe44e4375b,d633ba404308022cca0cebe7b905c2dae39494ee,,1434,3,196808,1328,False,True,True,1434,False,False
24 changes: 12 additions & 12 deletions results/combined/merges_analyzed/3breadt/dd-plist.csv
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_lines,test merge,sampled for testing
1,refs/heads/master,fc51e4778e650af221994f5f8c6db4b68fda0e0b,36f98160266bff7b262fe435ecd6747e36490c02,91f8ba7fd92a9a503484a540e5fd3e03f411d98a,,False,True,True,9,82,False,False
2,refs/heads/master,743ffecd4c389f5476c8d1a2285d515a384d3b86,c3117754c4fe4cfd380c352e0ac1ae9cf56425d9,537a2177825470d7d6a0c962739545c900c37582,,False,True,True,6,385,False,False
3,refs/heads/master,2c8c164d66272b00ac0684577b095b1aa20a0f81,2120e77a988d28fba214714710a43521b4ac62b8,101e5a636d7b59c2dade073645a075b6eeee9614,,False,True,True,6,197,False,False
5,refs/heads/master,b9be0f46797aab66cf5302584d69bd62a00c8e64,69189ffa141974628e9c0b547e8d3c9ebd322e53,12602e55c0997aa55903f1f86fd6f3f6331549a8,,False,True,True,9,22,False,False
7,refs/heads/master,a78d2509870567ef42bc2edea887a9e10ccaeff4,0f6cbd92ebdf646db29ec938192319147026b8c3,9d891d285bb3fab4e893c2b2c9145e7c7ba8615a,,False,True,True,16,1474,False,False
12,refs/heads/master,a1aa6645688f8a150ba3f78caa7e4feeb2293b3d,138da8ea7813113f0b22175afd18bca8ef2d7984,36d3419679bacfd3121d541f0732098de30c7357,,False,False,True,3,40,False,False
18,refs/heads/master,9e1a7d997a274ded5456c85d0c91e4ce1dc7af79,15482f0821c80781817975b266cfecc74ede2cd2,a599fad535fa6d8ef91e8418eea9810301de3290,,False,True,True,19,417,False,False
20,refs/remotes/origin/pull/27,31e4d0e7165c62c8e776f4a14845def3e53f876f,65e704efb8a695efd08ca2a996ddd6c03c469e63,2c8c164d66272b00ac0684577b095b1aa20a0f81,,False,True,True,5,111,False,False
21,refs/remotes/origin/pull/30,012791e428d9a5cad23dc001a9c42aee4121d764,31e4d0e7165c62c8e776f4a14845def3e53f876f,297614189d591b2fa82205b299a02558b124a839,,False,False,False,0,0,False,False
22,refs/remotes/origin/pull/56,da735ab2a75ca50a9ea77441997ceb8cac2a53a3,5df44adc532b16b80998efb5c1082ed699801bc5,1c06f944907022a9e6d9af0ad40a85dc2f2f44bb,,False,True,True,92,5494,False,False
23,refs/remotes/origin/pull/56,5df44adc532b16b80998efb5c1082ed699801bc5,f6911b193a27eb940dfd40034453dec2dd361369,f96e82d6420867d010687a220a90107778c74da9,,False,False,False,0,0,False,False
idx,branch_name,merge,left,right,notes,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,diff contains java file,imports_involved,non_java_involved,num_diff_files,test merge,sampled for testing
1,refs/heads/master,fc51e4778e650af221994f5f8c6db4b68fda0e0b,36f98160266bff7b262fe435ecd6747e36490c02,91f8ba7fd92a9a503484a540e5fd3e03f411d98a,,9,1,97,25,False,True,True,9,False,False
2,refs/heads/master,743ffecd4c389f5476c8d1a2285d515a384d3b86,c3117754c4fe4cfd380c352e0ac1ae9cf56425d9,537a2177825470d7d6a0c962739545c900c37582,,6,1,389,98,False,True,True,6,False,False
3,refs/heads/master,2c8c164d66272b00ac0684577b095b1aa20a0f81,2120e77a988d28fba214714710a43521b4ac62b8,101e5a636d7b59c2dade073645a075b6eeee9614,,6,1,229,31,False,True,True,6,False,False
5,refs/heads/master,b9be0f46797aab66cf5302584d69bd62a00c8e64,69189ffa141974628e9c0b547e8d3c9ebd322e53,12602e55c0997aa55903f1f86fd6f3f6331549a8,,9,1,44,12,False,True,True,9,False,False
7,refs/heads/master,a78d2509870567ef42bc2edea887a9e10ccaeff4,0f6cbd92ebdf646db29ec938192319147026b8c3,9d891d285bb3fab4e893c2b2c9145e7c7ba8615a,,16,1,1797,25,False,True,True,16,False,False
12,refs/heads/master,a1aa6645688f8a150ba3f78caa7e4feeb2293b3d,138da8ea7813113f0b22175afd18bca8ef2d7984,36d3419679bacfd3121d541f0732098de30c7357,,3,1,40,9,False,False,True,3,False,False
18,refs/heads/master,9e1a7d997a274ded5456c85d0c91e4ce1dc7af79,15482f0821c80781817975b266cfecc74ede2cd2,a599fad535fa6d8ef91e8418eea9810301de3290,,19,1,540,44,False,True,True,19,False,False
20,refs/remotes/origin/pull/27,31e4d0e7165c62c8e776f4a14845def3e53f876f,65e704efb8a695efd08ca2a996ddd6c03c469e63,2c8c164d66272b00ac0684577b095b1aa20a0f81,,5,1,127,21,False,True,True,5,False,False
21,refs/remotes/origin/pull/30,012791e428d9a5cad23dc001a9c42aee4121d764,31e4d0e7165c62c8e776f4a14845def3e53f876f,297614189d591b2fa82205b299a02558b124a839,,2,2,0,Error,False,False,False,0,False,False
22,refs/remotes/origin/pull/56,da735ab2a75ca50a9ea77441997ceb8cac2a53a3,5df44adc532b16b80998efb5c1082ed699801bc5,1c06f944907022a9e6d9af0ad40a85dc2f2f44bb,,92,0,22211,850,False,True,True,92,False,False
23,refs/remotes/origin/pull/56,5df44adc532b16b80998efb5c1082ed699801bc5,f6911b193a27eb940dfd40034453dec2dd361369,f96e82d6420867d010687a220a90107778c74da9,,2,2,0,Error,False,False,False,0,False,False
18 changes: 9 additions & 9 deletions results/combined/merges_analyzed/3scale/3scale_ws_api_for_java.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_lines,test merge,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing
12,refs/remotes/origin/pull/10,c77b1297186f967622adaeaaa8996a27f77cf1fc,3c9c2af6b97384850a9acd7245d7c62ec7afd593,88d410aa7befa2c5499395a1fec6da34c9cb0b5f,,True,True,True,10,211,False,Tests_failed,29f6d014333b808c5b2979ba16de7e6bac963e80ad0cba35ae14faa710e7c431,False,Tests_failed,5cdfe7b9b14c055deb49591da977b31082e45249cd70e299661f2de943586fc8,False
13,refs/remotes/origin/pull/10,d5be99e116542e2f465caba331c0ec589bf726d9,c68f61f0fa127bfeaea5e4e255e7b3730df4a0f6,f85b6777113505109cc1f1d4a9edea615fd403f5,,False,True,True,6,141,False,,,,,,False
14,refs/remotes/origin/pull/10,ea282678896734ff75f85799cfd7ae3f3515790c,ea143d850887e020a5f505f0917da33cf186af75,94607fd9ce59988a15dca58958c7ae30bf51155f,,False,True,True,6,35,False,,,,,,False
15,refs/remotes/origin/pull/10,c3b5f5d43f5699e2e4d698bd32a74dad9ac1d477,78eceb43ad7a9dd89e7c2f36f82b0e36061e40ff,85d75a23e94054bbb8c219f21036872149150a90,,True,True,True,275,10159,False,Tests_failed,257e4c08564208c7ebf0f6e8185853cf539495c4508abc372e8e39cbae743174,False,Tests_failed,9d947990e32bc40c172cff6bdce6a3e34ff00f241abe661da55bae8a1e399000,False
16,refs/remotes/origin/pull/10,d0c36bece9c7b6409a6d57008f327287bfdffa06,d2ddc1e3a56d5b420971b107bdcd3b99bd48d0ef,799779c8c760115a7e8db66d8c24bfccd5a55416,,False,False,False,0,0,False,,,,,,False
17,refs/remotes/origin/pull/10,332b6ed4e324199565e235cd915368f9bc1b43d2,4650578dee712b2b08f2ead2bf6a531f82b1e0e9,d623f491daa2f14f06f53338265d28a489138a6b,,True,True,True,112,1912,False,Tests_failed,78bd4536994ebea95ea8ebd2ea2e7c2b38f2a1fec25ecf322a0e8ccd1406b50b,False,Tests_failed,aa6ad3f4018260b629417aa44faa0ed893f6092c9f5dd08efdae1fd8223de2ba,False
18,refs/remotes/origin/pull/11,9616295df7f50bfc3ec267047e569e83b6cdb0fa,5ac6e3f5b0c069465004538a3b95a37fcaf7b57e,88d410aa7befa2c5499395a1fec6da34c9cb0b5f,,True,True,True,9,110,False,Tests_failed,d91c6fc51df617b83f7695a8eee5308421e57fe98f4a0c678e994c79904f69f0,False,Tests_failed,5cdfe7b9b14c055deb49591da977b31082e45249cd70e299661f2de943586fc8,False
20,refs/remotes/origin/pull/13,3054b1c14ba79e67394915d27d5e5d766f3b3db0,f39a51f3fa3259bd4cabd16fe9c025fe4dbbea1f,3c11b36e5054ec09cdc29ec3d0e9273406163498,,False,True,True,10,917,False,,,,,,False
idx,branch_name,merge,left,right,notes,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,diff contains java file,imports_involved,non_java_involved,num_diff_files,test merge,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing
12,refs/remotes/origin/pull/10,c77b1297186f967622adaeaaa8996a27f77cf1fc,3c9c2af6b97384850a9acd7245d7c62ec7afd593,88d410aa7befa2c5499395a1fec6da34c9cb0b5f,,10,4,266,29,True,True,True,10,False,Tests_failed,29f6d014333b808c5b2979ba16de7e6bac963e80ad0cba35ae14faa710e7c431,False,Tests_failed,5cdfe7b9b14c055deb49591da977b31082e45249cd70e299661f2de943586fc8,False
13,refs/remotes/origin/pull/10,d5be99e116542e2f465caba331c0ec589bf726d9,c68f61f0fa127bfeaea5e4e255e7b3730df4a0f6,f85b6777113505109cc1f1d4a9edea615fd403f5,,6,1,193,11,False,True,True,6,False,,,,,,False
14,refs/remotes/origin/pull/10,ea282678896734ff75f85799cfd7ae3f3515790c,ea143d850887e020a5f505f0917da33cf186af75,94607fd9ce59988a15dca58958c7ae30bf51155f,,6,1,47,8,False,True,True,6,False,,,,,,False
15,refs/remotes/origin/pull/10,c3b5f5d43f5699e2e4d698bd32a74dad9ac1d477,78eceb43ad7a9dd89e7c2f36f82b0e36061e40ff,85d75a23e94054bbb8c219f21036872149150a90,,275,4,43918,1285,True,True,True,275,False,Tests_failed,257e4c08564208c7ebf0f6e8185853cf539495c4508abc372e8e39cbae743174,False,Tests_failed,9d947990e32bc40c172cff6bdce6a3e34ff00f241abe661da55bae8a1e399000,False
16,refs/remotes/origin/pull/10,d0c36bece9c7b6409a6d57008f327287bfdffa06,d2ddc1e3a56d5b420971b107bdcd3b99bd48d0ef,799779c8c760115a7e8db66d8c24bfccd5a55416,,210,210,0,Error,False,False,False,0,False,,,,,,False
17,refs/remotes/origin/pull/10,332b6ed4e324199565e235cd915368f9bc1b43d2,4650578dee712b2b08f2ead2bf6a531f82b1e0e9,d623f491daa2f14f06f53338265d28a489138a6b,,113,4,4448,200,True,True,True,112,False,Tests_failed,78bd4536994ebea95ea8ebd2ea2e7c2b38f2a1fec25ecf322a0e8ccd1406b50b,False,Tests_failed,aa6ad3f4018260b629417aa44faa0ed893f6092c9f5dd08efdae1fd8223de2ba,False
18,refs/remotes/origin/pull/11,9616295df7f50bfc3ec267047e569e83b6cdb0fa,5ac6e3f5b0c069465004538a3b95a37fcaf7b57e,88d410aa7befa2c5499395a1fec6da34c9cb0b5f,,9,3,119,31,True,True,True,9,False,Tests_failed,d91c6fc51df617b83f7695a8eee5308421e57fe98f4a0c678e994c79904f69f0,False,Tests_failed,5cdfe7b9b14c055deb49591da977b31082e45249cd70e299661f2de943586fc8,False
20,refs/remotes/origin/pull/13,3054b1c14ba79e67394915d27d5e5d766f3b3db0,f39a51f3fa3259bd4cabd16fe9c025fe4dbbea1f,3c11b36e5054ec09cdc29ec3d0e9273406163498,,10,2,1126,108,False,True,True,10,False,,,,,,False
4 changes: 2 additions & 2 deletions results/combined/merges_analyzed/42lines/wicket-bean-validation.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_lines,test merge,sampled for testing
1,refs/heads/master,ab027c7dd3c2d43b9e8482c9f7985fed29a566a8,e294b31dc730f1165ee3036c2014c069eb92c5db,691b58657341c29c8ba7744aa1e731da712cbe7a,,False,False,True,3,7,False,False
idx,branch_name,merge,left,right,notes,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,diff contains java file,imports_involved,non_java_involved,num_diff_files,test merge,sampled for testing
1,refs/heads/master,ab027c7dd3c2d43b9e8482c9f7985fed29a566a8,e294b31dc730f1165ee3036c2014c069eb92c5db,691b58657341c29c8ba7744aa1e731da712cbe7a,,3,1,14,4,False,False,True,3,False,False
14 changes: 7 additions & 7 deletions results/combined/merges_analyzed/42lines/wicket-cdi.csv
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_lines,test merge,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing
1,refs/heads/master,0eb06719323b5c7a7c3a6aab817b4cb22734e5d5,5d603f50d20512d2facc16d7c4eca91922573d69,f814ff463bb22d5c4a6a3bde4d618ac3c8c66f99,,False,False,True,2,2,False,,,,,,False
4,refs/heads/master,c686a611def9c638c04ea6136f34970d8153619e,15ce59f3a48741a0d43abb38b126c4b72638cbe8,bf8c727432386d2c7463e80a0adcd0011338c176,,False,False,True,5,0,False,,,,,,False
5,refs/heads/master,08bf4ab3c0690cc5e1ae570a8be0a51c54aef6d2,60755f93c540565c5de7a00c44418b088a8e2d63,2c332a26b6f3f8b0dc327ce6ee1a9d0c99a5533d,,False,True,True,12,74,False,,,,,,False
6,refs/heads/master,830e59091580942745741b6fa7b73862532af2bf,e087d698f5d14ab245a4d41b605e27ee553710e0,e4a457569dbdbdd5ffbcb622b73d15ae4823253c,,False,False,True,5,14,False,,,,,,False
7,refs/heads/master,472f85a215a879499500f5b8d0537866d0a03fdc,74e4c40b4cb6eec28143aed284ed790c6e498135,cc7b9e2c9573e55bdfadd862526df13e0388538c,,True,True,True,10,12,False,Tests_failed,a96fb6c763060b5573ef69ad0dc3bbcb370d9bc8b87d38b3b58989d895d2309b,False,Tests_passed,704a6064574c50b79d259f60ebc271b9567a1ad9b64f5274bd566fa9eee5decb,False
8,refs/heads/master,0dde2eb0b2a973de1707e8d03f0cd7843dec1a89,97db23decd210f9517a497511035422e02e187e4,cee744a0a1ef5fd2ae02a90f658f5be11d638ad6,,False,True,True,18,40,False,,,,,,False
idx,branch_name,merge,left,right,notes,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,diff contains java file,imports_involved,non_java_involved,num_diff_files,test merge,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing
1,refs/heads/master,0eb06719323b5c7a7c3a6aab817b4cb22734e5d5,5d603f50d20512d2facc16d7c4eca91922573d69,f814ff463bb22d5c4a6a3bde4d618ac3c8c66f99,,2,2,20,3,False,False,True,2,False,,,,,,False
4,refs/heads/master,c686a611def9c638c04ea6136f34970d8153619e,15ce59f3a48741a0d43abb38b126c4b72638cbe8,bf8c727432386d2c7463e80a0adcd0011338c176,,5,1,8,4,False,False,True,5,False,,,,,,False
5,refs/heads/master,08bf4ab3c0690cc5e1ae570a8be0a51c54aef6d2,60755f93c540565c5de7a00c44418b088a8e2d63,2c332a26b6f3f8b0dc327ce6ee1a9d0c99a5533d,,12,1,331,24,False,True,True,12,False,,,,,,False
6,refs/heads/master,830e59091580942745741b6fa7b73862532af2bf,e087d698f5d14ab245a4d41b605e27ee553710e0,e4a457569dbdbdd5ffbcb622b73d15ae4823253c,,5,1,71,5,False,False,True,5,False,,,,,,False
7,refs/heads/master,472f85a215a879499500f5b8d0537866d0a03fdc,74e4c40b4cb6eec28143aed284ed790c6e498135,cc7b9e2c9573e55bdfadd862526df13e0388538c,,10,2,150,26,True,True,True,10,False,Tests_failed,a96fb6c763060b5573ef69ad0dc3bbcb370d9bc8b87d38b3b58989d895d2309b,False,Tests_passed,704a6064574c50b79d259f60ebc271b9567a1ad9b64f5274bd566fa9eee5decb,False
8,refs/heads/master,0dde2eb0b2a973de1707e8d03f0cd7843dec1a89,97db23decd210f9517a497511035422e02e187e4,cee744a0a1ef5fd2ae02a90f658f5be11d638ad6,,18,2,1581,37,False,True,True,18,False,,,,,,False
Loading

0 comments on commit 1f98836

Please sign in to comment.