{"action":"created","comment":{"url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/comments/220025624","pull_request_review_id":158339200,"id":220025624,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIyMDAyNTYyNA==","diff_hunk":"@@ -26,14 +28,15 @@\n \n     public static void handle(MergeContext context) {\n         //when both developers rename the same method/constructor\n-        if (!JFSTMerge.keepBothVersionsOfRenamedMethod) handleMutualRenamings(context);\n+        handleMutualRenamings(context);\n \n         //when one of the developers rename a method/constructor\n         handleSingleRenamings(context);","path":"src/main/java/br/ufpe/cin/mergers/handlers/RenamingConflictsHandler.java","position":24,"original_position":22,"commit_id":"e13faaf3b016e083eb92a6a1c3079b86e6d5bcd8","original_commit_id":"fe069d6e6b155618fa83c13af03e8c2d4724eaec","user":{"login":"gaabs","id":8092225,"node_id":"MDQ6VXNlcjgwOTIyMjU=","avatar_url":"https://avatars2.githubusercontent.com/u/8092225?v=4","gravatar_id":"","url":"https://api.github.com/users/gaabs","html_url":"https://github.com/gaabs","followers_url":"https://api.github.com/users/gaabs/followers","following_url":"https://api.github.com/users/gaabs/following{/other_user}","gists_url":"https://api.github.com/users/gaabs/gists{/gist_id}","starred_url":"https://api.github.com/users/gaabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gaabs/subscriptions","organizations_url":"https://api.github.com/users/gaabs/orgs","repos_url":"https://api.github.com/users/gaabs/repos","events_url":"https://api.github.com/users/gaabs/events{/privacy}","received_events_url":"https://api.github.com/users/gaabs/received_events","type":"User","site_admin":false},"body":"It's true that a given node should only be part of a SingleRenaming or a MutualRenaming. \r\n\r\nThe thing is that the MergeContext contains lists of nodes, so in the current architecture, both handleMutualRenamings and handleSingleRenamings should be called.","created_at":"2018-09-25T00:05:58Z","updated_at":"2018-09-25T00:05:58Z","html_url":"https://github.com/guilhermejccavalcanti/jFSTMerge/pull/43#discussion_r220025624","pull_request_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/43","author_association":"COLLABORATOR","_links":{"self":{"href":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/comments/220025624"},"html":{"href":"https://github.com/guilhermejccavalcanti/jFSTMerge/pull/43#discussion_r220025624"},"pull_request":{"href":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/43"}},"in_reply_to_id":218522122},"pull_request":{"url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/43","id":215787730,"node_id":"MDExOlB1bGxSZXF1ZXN0MjE1Nzg3NzMw","html_url":"https://github.com/guilhermejccavalcanti/jFSTMerge/pull/43","diff_url":"https://github.com/guilhermejccavalcanti/jFSTMerge/pull/43.diff","patch_url":"https://github.com/guilhermejccavalcanti/jFSTMerge/pull/43.patch","issue_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/issues/43","number":43,"state":"open","locked":false,"title":"Renaming handler with merge new signature and new body option","user":{"login":"gaabs","id":8092225,"node_id":"MDQ6VXNlcjgwOTIyMjU=","avatar_url":"https://avatars2.githubusercontent.com/u/8092225?v=4","gravatar_id":"","url":"https://api.github.com/users/gaabs","html_url":"https://github.com/gaabs","followers_url":"https://api.github.com/users/gaabs/followers","following_url":"https://api.github.com/users/gaabs/following{/other_user}","gists_url":"https://api.github.com/users/gaabs/gists{/gist_id}","starred_url":"https://api.github.com/users/gaabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gaabs/subscriptions","organizations_url":"https://api.github.com/users/gaabs/orgs","repos_url":"https://api.github.com/users/gaabs/repos","events_url":"https://api.github.com/users/gaabs/events{/privacy}","received_events_url":"https://api.github.com/users/gaabs/received_events","type":"User","site_admin":false},"body":"This PR address the following changes:\r\n\r\n- Adds option to merge new signature and new body on renamings #17\r\n- Changes option to choose renaming strategy (`--renaming`):\r\n  - SAFE(`\"safe\"`): Default behavior. Same results as unstructured merge.\r\n  - KEEP_BOTH_METHODS(`\"keep_both\"`): Keeps both versions of the renamed method: one with renamed signature and old body; another with modified body and old signature. (https://github.com/guilhermejccavalcanti/jFSTMerge/pull/38)\r\n  - MERGE_METHODS(`\"merge_methods\"`): Keeps just one element with new signature and modified body.\r\n\r\nMERGE_METHODS observed behavior:\r\n\r\n(Single renaming)\r\n![image](https://user-images.githubusercontent.com/8092225/45590483-667e4780-b90f-11e8-9241-180126098abe.png)\r\n\r\n(Mutual renaming)\r\n![image](https://user-images.githubusercontent.com/8092225/45590477-523a4a80-b90f-11e8-9228-d33f7b4d380a.png)\r\n\r\n\r\nA future Pull Request should address the matter of checking method calls, in order to reduce False Negatives with these new renaming strategies.","created_at":"2018-09-15T20:22:22Z","updated_at":"2018-09-25T00:05:58Z","closed_at":null,"merged_at":null,"merge_commit_sha":"316c6328bc908f48b53cbbc2640738040bebedcf","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/43/commits","review_comments_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/43/comments","review_comment_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/comments{/number}","comments_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/issues/43/comments","statuses_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/statuses/e13faaf3b016e083eb92a6a1c3079b86e6d5bcd8","head":{"label":"gaabs:feature/new-renaming-handler","ref":"feature/new-renaming-handler","sha":"e13faaf3b016e083eb92a6a1c3079b86e6d5bcd8","user":{"login":"gaabs","id":8092225,"node_id":"MDQ6VXNlcjgwOTIyMjU=","avatar_url":"https://avatars2.githubusercontent.com/u/8092225?v=4","gravatar_id":"","url":"https://api.github.com/users/gaabs","html_url":"https://github.com/gaabs","followers_url":"https://api.github.com/users/gaabs/followers","following_url":"https://api.github.com/users/gaabs/following{/other_user}","gists_url":"https://api.github.com/users/gaabs/gists{/gist_id}","starred_url":"https://api.github.com/users/gaabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gaabs/subscriptions","organizations_url":"https://api.github.com/users/gaabs/orgs","repos_url":"https://api.github.com/users/gaabs/repos","events_url":"https://api.github.com/users/gaabs/events{/privacy}","received_events_url":"https://api.github.com/users/gaabs/received_events","type":"User","site_admin":false},"repo":{"id":145233773,"node_id":"MDEwOlJlcG9zaXRvcnkxNDUyMzM3NzM=","name":"jFSTMerge","full_name":"gaabs/jFSTMerge","private":false,"owner":{"login":"gaabs","id":8092225,"node_id":"MDQ6VXNlcjgwOTIyMjU=","avatar_url":"https://avatars2.githubusercontent.com/u/8092225?v=4","gravatar_id":"","url":"https://api.github.com/users/gaabs","html_url":"https://github.com/gaabs","followers_url":"https://api.github.com/users/gaabs/followers","following_url":"https://api.github.com/users/gaabs/following{/other_user}","gists_url":"https://api.github.com/users/gaabs/gists{/gist_id}","starred_url":"https://api.github.com/users/gaabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gaabs/subscriptions","organizations_url":"https://api.github.com/users/gaabs/orgs","repos_url":"https://api.github.com/users/gaabs/repos","events_url":"https://api.github.com/users/gaabs/events{/privacy}","received_events_url":"https://api.github.com/users/gaabs/received_events","type":"User","site_admin":false},"html_url":"https://github.com/gaabs/jFSTMerge","description":"Semistructured merge tool for java applications.","fork":true,"url":"https://api.github.com/repos/gaabs/jFSTMerge","forks_url":"https://api.github.com/repos/gaabs/jFSTMerge/forks","keys_url":"https://api.github.com/repos/gaabs/jFSTMerge/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gaabs/jFSTMerge/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gaabs/jFSTMerge/teams","hooks_url":"https://api.github.com/repos/gaabs/jFSTMerge/hooks","issue_events_url":"https://api.github.com/repos/gaabs/jFSTMerge/issues/events{/number}","events_url":"https://api.github.com/repos/gaabs/jFSTMerge/events","assignees_url":"https://api.github.com/repos/gaabs/jFSTMerge/assignees{/user}","branches_url":"https://api.github.com/repos/gaabs/jFSTMerge/branches{/branch}","tags_url":"https://api.github.com/repos/gaabs/jFSTMerge/tags","blobs_url":"https://api.github.com/repos/gaabs/jFSTMerge/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gaabs/jFSTMerge/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gaabs/jFSTMerge/git/refs{/sha}","trees_url":"https://api.github.com/repos/gaabs/jFSTMerge/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gaabs/jFSTMerge/statuses/{sha}","languages_url":"https://api.github.com/repos/gaabs/jFSTMerge/languages","stargazers_url":"https://api.github.com/repos/gaabs/jFSTMerge/stargazers","contributors_url":"https://api.github.com/repos/gaabs/jFSTMerge/contributors","subscribers_url":"https://api.github.com/repos/gaabs/jFSTMerge/subscribers","subscription_url":"https://api.github.com/repos/gaabs/jFSTMerge/subscription","commits_url":"https://api.github.com/repos/gaabs/jFSTMerge/commits{/sha}","git_commits_url":"https://api.github.com/repos/gaabs/jFSTMerge/git/commits{/sha}","comments_url":"https://api.github.com/repos/gaabs/jFSTMerge/comments{/number}","issue_comment_url":"https://api.github.com/repos/gaabs/jFSTMerge/issues/comments{/number}","contents_url":"https://api.github.com/repos/gaabs/jFSTMerge/contents/{+path}","compare_url":"https://api.github.com/repos/gaabs/jFSTMerge/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gaabs/jFSTMerge/merges","archive_url":"https://api.github.com/repos/gaabs/jFSTMerge/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gaabs/jFSTMerge/downloads","issues_url":"https://api.github.com/repos/gaabs/jFSTMerge/issues{/number}","pulls_url":"https://api.github.com/repos/gaabs/jFSTMerge/pulls{/number}","milestones_url":"https://api.github.com/repos/gaabs/jFSTMerge/milestones{/number}","notifications_url":"https://api.github.com/repos/gaabs/jFSTMerge/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gaabs/jFSTMerge/labels{/name}","releases_url":"https://api.github.com/repos/gaabs/jFSTMerge/releases{/id}","deployments_url":"https://api.github.com/repos/gaabs/jFSTMerge/deployments","created_at":"2018-08-18T16:05:49Z","updated_at":"2018-09-09T22:22:19Z","pushed_at":"2018-09-22T21:44:00Z","git_url":"git://github.com/gaabs/jFSTMerge.git","ssh_url":"git@github.com:gaabs/jFSTMerge.git","clone_url":"https://github.com/gaabs/jFSTMerge.git","svn_url":"https://github.com/gaabs/jFSTMerge","homepage":null,"size":444451,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"guilhermejccavalcanti:master","ref":"master","sha":"89850d466c9778cd8fec57cd9d1a8982a659677f","user":{"login":"guilhermejccavalcanti","id":3333981,"node_id":"MDQ6VXNlcjMzMzM5ODE=","avatar_url":"https://avatars1.githubusercontent.com/u/3333981?v=4","gravatar_id":"","url":"https://api.github.com/users/guilhermejccavalcanti","html_url":"https://github.com/guilhermejccavalcanti","followers_url":"https://api.github.com/users/guilhermejccavalcanti/followers","following_url":"https://api.github.com/users/guilhermejccavalcanti/following{/other_user}","gists_url":"https://api.github.com/users/guilhermejccavalcanti/gists{/gist_id}","starred_url":"https://api.github.com/users/guilhermejccavalcanti/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guilhermejccavalcanti/subscriptions","organizations_url":"https://api.github.com/users/guilhermejccavalcanti/orgs","repos_url":"https://api.github.com/users/guilhermejccavalcanti/repos","events_url":"https://api.github.com/users/guilhermejccavalcanti/events{/privacy}","received_events_url":"https://api.github.com/users/guilhermejccavalcanti/received_events","type":"User","site_admin":false},"repo":{"id":62087929,"node_id":"MDEwOlJlcG9zaXRvcnk2MjA4NzkyOQ==","name":"jFSTMerge","full_name":"guilhermejccavalcanti/jFSTMerge","private":false,"owner":{"login":"guilhermejccavalcanti","id":3333981,"node_id":"MDQ6VXNlcjMzMzM5ODE=","avatar_url":"https://avatars1.githubusercontent.com/u/3333981?v=4","gravatar_id":"","url":"https://api.github.com/users/guilhermejccavalcanti","html_url":"https://github.com/guilhermejccavalcanti","followers_url":"https://api.github.com/users/guilhermejccavalcanti/followers","following_url":"https://api.github.com/users/guilhermejccavalcanti/following{/other_user}","gists_url":"https://api.github.com/users/guilhermejccavalcanti/gists{/gist_id}","starred_url":"https://api.github.com/users/guilhermejccavalcanti/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guilhermejccavalcanti/subscriptions","organizations_url":"https://api.github.com/users/guilhermejccavalcanti/orgs","repos_url":"https://api.github.com/users/guilhermejccavalcanti/repos","events_url":"https://api.github.com/users/guilhermejccavalcanti/events{/privacy}","received_events_url":"https://api.github.com/users/guilhermejccavalcanti/received_events","type":"User","site_admin":false},"html_url":"https://github.com/guilhermejccavalcanti/jFSTMerge","description":"Semistructured merge tool for java applications.","fork":false,"url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge","forks_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/forks","keys_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/keys{/key_id}","collaborators_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/teams","hooks_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/hooks","issue_events_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/issues/events{/number}","events_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/events","assignees_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/assignees{/user}","branches_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/branches{/branch}","tags_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/tags","blobs_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/git/refs{/sha}","trees_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/git/trees{/sha}","statuses_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/statuses/{sha}","languages_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/languages","stargazers_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/stargazers","contributors_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/contributors","subscribers_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/subscribers","subscription_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/subscription","commits_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/commits{/sha}","git_commits_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/git/commits{/sha}","comments_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/comments{/number}","issue_comment_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/issues/comments{/number}","contents_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/contents/{+path}","compare_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/compare/{base}...{head}","merges_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/merges","archive_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/downloads","issues_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/issues{/number}","pulls_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls{/number}","milestones_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/milestones{/number}","notifications_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/labels{/name}","releases_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/releases{/id}","deployments_url":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/deployments","created_at":"2016-06-27T21:01:14Z","updated_at":"2018-09-20T13:12:33Z","pushed_at":"2018-09-23T00:21:44Z","git_url":"git://github.com/guilhermejccavalcanti/jFSTMerge.git","ssh_url":"git@github.com:guilhermejccavalcanti/jFSTMerge.git","clone_url":"https://github.com/guilhermejccavalcanti/jFSTMerge.git","svn_url":"https://github.com/guilhermejccavalcanti/jFSTMerge","homepage":null,"size":445545,"stargazers_count":5,"watchers_count":5,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":18,"mirror_url":null,"archived":false,"open_issues_count":23,"license":null,"forks":18,"open_issues":23,"watchers":5,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/43"},"html":{"href":"https://github.com/guilhermejccavalcanti/jFSTMerge/pull/43"},"issue":{"href":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/issues/43"},"comments":{"href":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/issues/43/comments"},"review_comments":{"href":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/43/comments"},"review_comment":{"href":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/pulls/43/commits"},"statuses":{"href":"https://api.github.com/repos/guilhermejccavalcanti/jFSTMerge/statuses/e13faaf3b016e083eb92a6a1c3079b86e6d5bcd8"}},"author_association":"COLLABORATOR"}}
{"actor":{"display_login":"gaabs"}}