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

fix: Minor adjustments in Generic Merge experiment data collectors #199

Draft
wants to merge 90 commits into
base: master
Choose a base branch
from
+1,227 −938
Draft

fix: Minor adjustments in Generic Merge experiment data collectors #199

Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
8c94943
fix: Replace existing on copy. Include copy in execution time calcula…
jpedroh Aug 18, 2024
8948eb5
feat: use built in filter to discard fast forwards
jpedroh Aug 21, 2024
49ffc49
feat: improve logging
jpedroh Aug 21, 2024
8c1b8c7
feat: Add trigger of build on scenarios
jpedroh Sep 8, 2024
062144f
fix: issues and use in commit list
jpedroh Sep 8, 2024
eca411c
fix: incorrect condition
jpedroh Sep 8, 2024
ef43c87
fix: simplify code
jpedroh Sep 8, 2024
4de63d5
fix: is in commit list initialization
jpedroh Sep 8, 2024
fcf3971
fix: tweak code
jpedroh Sep 8, 2024
52174a4
fix: add more logs
jpedroh Sep 8, 2024
86d2eff
fix: issues on build reqquesting
jpedroh Sep 8, 2024
060cd61
fix: wrong serialization
jpedroh Sep 11, 2024
6710eab
fix: remove commmit filter
jpedroh Sep 11, 2024
3ea7fbd
fix: incorrect commit filter
jpedroh Sep 12, 2024
a684347
feat: ignore empty lines on report
jpedroh Sep 13, 2024
aa3df93
feat: run 10 times for perf sampling
jpedroh Sep 19, 2024
057a3ee
feat: add flag to include pull request branches in analysis
jpedroh Oct 22, 2024
d6aedf8
feat: add commit filter by project and merge sha
jpedroh Oct 22, 2024
ad28002
feat: alter commit filter
jpedroh Oct 22, 2024
c0b778b
feat: update github actions job to add retries and multiple jdk versions
jpedroh Oct 23, 2024
59611af
feat: run merge tool onyl once
jpedroh Oct 23, 2024
d9cac37
feat: tweak logging
jpedroh Oct 25, 2024
168f9c0
feat: add logging
jpedroh Oct 25, 2024
a93f035
feat: wrong worder
jpedroh Oct 25, 2024
395223d
fix: add missing flag
jpedroh Oct 31, 2024
04d31b3
fix: equals or substring
jpedroh Nov 3, 2024
2d3bf9b
feat: discard unstaged changes
jpedroh Nov 3, 2024
f29fe8b
feat:comment datacollectors
jpedroh Nov 3, 2024
5d26ca5
feat: add waitFor
jpedroh Nov 3, 2024
a5fdd46
feat: add logging
jpedroh Nov 3, 2024
74728e7
feat: add more logs
jpedroh Nov 3, 2024
70d658d
feat: skip output for now
jpedroh Nov 3, 2024
83c7dba
feat: implement new merge tool executor idea
jpedroh Nov 6, 2024
05fa257
feat: testing
jpedroh Nov 6, 2024
d5d591a
skip normalization on non fast forward
jpedroh Nov 6, 2024
23b0321
feat: use non mutual modified
jpedroh Nov 6, 2024
ef62a0e
feat: remove initialization
jpedroh Nov 6, 2024
317ed55
feat: add comparison between output files
jpedroh Nov 6, 2024
81e7c52
fix: wrong serialization
jpedroh Nov 6, 2024
51e18ab
feat: run some collectors in parallel
jpedroh Nov 6, 2024
69b09de
feat: add collection of merge conflicts information
jpedroh Nov 6, 2024
90dd48d
feat: remove normalization in base left right.
jpedroh Nov 6, 2024
c617a17
feat: add logging
jpedroh Nov 6, 2024
af4d08d
do not run in parallel, fix psork command
jpedroh Nov 6, 2024
793294a
feat: do not override if it already exists
jpedroh Nov 6, 2024
31e6601
feat: delete old files
jpedroh Nov 7, 2024
bfdbcdb
chore: revert
jpedroh Nov 7, 2024
ffbb1d0
chore: revert chnages
jpedroh Nov 7, 2024
e7b17a2
chore: revert changes
jpedroh Nov 7, 2024
d8757e2
feat: add possibility to customize commit merges list
jpedroh Nov 7, 2024
3346037
feat: remove some logics
jpedroh Nov 7, 2024
f875e68
fix: dangling reference
jpedroh Nov 7, 2024
88f21c7
feat: add code syntatic normalization with spork
jpedroh Nov 18, 2024
3115b0e
refactor: alter normalization logic
jpedroh Nov 23, 2024
859b2b2
feat: add error treating when spork fails
jpedroh Nov 23, 2024
4d80933
feat: extract reports write to syncronized block
jpedroh Nov 24, 2024
c7823fa
feat: add synchronized on CompareScenarioMergeConflictsDataCollector.…
jpedroh Nov 24, 2024
91d5a5c
feat: add extra collectors
jpedroh Nov 24, 2024
3ef944f
feat: add perf optimization for running collectors in parallel
jpedroh Nov 24, 2024
0944541
feat: comment some data collectors
jpedroh Nov 26, 2024
b5d2088
feat: use java parser for code formatting
jpedroh Dec 14, 2024
1754661
feat: skip execution of tools
jpedroh Dec 14, 2024
cbdf88b
feat: add normalization with spoon
jpedroh Dec 15, 2024
f038812
feat: remove run of tools
jpedroh Dec 15, 2024
71242f0
feat: tweak configuration
jpedroh Dec 16, 2024
eca5ccd
feat: add build tool collection
jpedroh Dec 16, 2024
db2d949
feat: add logs
jpedroh Dec 16, 2024
1749450
feat: add config
jpedroh Dec 16, 2024
6f6dd5f
feat: testing spork normalziation in spork output
jpedroh Dec 18, 2024
2de1158
feat: adjust return
jpedroh Dec 18, 2024
7ed6152
feat: add mergiraf data collector
jpedroh Jan 1, 2025
1d9d7aa
feat: add log of error stream
jpedroh Jan 1, 2025
206981a
feat: adjust generic merge
jpedroh Jan 1, 2025
a296180
feat: add normalization of mergiraf and comparison
jpedroh Jan 7, 2025
698b0fe
feat: adjsut missing pieces
jpedroh Jan 7, 2025
97c6d07
feat: run only spork
jpedroh Jan 27, 2025
b286bf3
feat: adjust spork execution
jpedroh Jan 27, 2025
0c852b8
feat: run merge tools on the scenarios
jpedroh Feb 1, 2025
eecf738
feat: refine normalizations
jpedroh Feb 4, 2025
7d41dec
fix: issues on file normalization
jpedroh Feb 4, 2025
8ef4d07
feat: adjust syntactical comparisons
jpedroh Feb 6, 2025
0ed3255
fix: incorrect comparisons
jpedroh Feb 6, 2025
aba2ca0
feat: add comparison between tools
jpedroh Feb 6, 2025
24f53bf
feat: format before comparing
jpedroh Feb 6, 2025
b0c96f0
chore: tweak logging
jpedroh Feb 12, 2025
fa085b7
feat: add build/test trigger for jdime
jpedroh Feb 12, 2025
ef192ac
fix: rename branch
jpedroh Feb 12, 2025
80fff30
feat: run build check for last merge
jpedroh Feb 12, 2025
4191a69
chore: alter tool
jpedroh Feb 12, 2025
8911b65
run spork
jpedroh Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: revert changes
@jpedroh
jpedroh committed Nov 7, 2024
commit e7b17a2548df64359cddc41198e9d72a548e8dbe
1 change: 0 additions & 1 deletion src/main/app/MiningFramework.groovy
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@ import interfaces.*
import exception.UnstagedChangesException

class MiningFramework {
private static LOG = LogManager.getLogger(MiningFramework.class)

private ArrayList<Project> projectList