{"action":"closed","number":281,"pull_request":{"url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/281","id":30865147,"html_url":"https://github.com/gemini-hlsw/ocs/pull/281","diff_url":"https://github.com/gemini-hlsw/ocs/pull/281.diff","patch_url":"https://github.com/gemini-hlsw/ocs/pull/281.patch","issue_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues/281","number":281,"state":"closed","locked":false,"title":"OCSADV-200: rename old MergePlan and old VcsFailure","user":{"login":"swalker2m","id":4906023,"avatar_url":"https://avatars.githubusercontent.com/u/4906023?v=3","gravatar_id":"","url":"https://api.github.com/users/swalker2m","html_url":"https://github.com/swalker2m","followers_url":"https://api.github.com/users/swalker2m/followers","following_url":"https://api.github.com/users/swalker2m/following{/other_user}","gists_url":"https://api.github.com/users/swalker2m/gists{/gist_id}","starred_url":"https://api.github.com/users/swalker2m/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/swalker2m/subscriptions","organizations_url":"https://api.github.com/users/swalker2m/orgs","repos_url":"https://api.github.com/users/swalker2m/repos","events_url":"https://api.github.com/users/swalker2m/events{/privacy}","received_events_url":"https://api.github.com/users/swalker2m/received_events","type":"User","site_admin":false},"body":"This is a trivial rename of a few classes in order to simplify continuing development.  The changes apply to classes in the _original merge algorithm_ whose names were the same as similar classes in the new algorithm.  Of course they were already in different packages and compiled and worked fine, but the Idea Scala plugin could not distinguish them properly in a package object.  For example in\r\n\r\n````scala\r\npackage edu.gemini.sp.vcs\r\n...\r\npackage object diff {\r\n  type MergeCorrection = MergePlan => Unmergeable \\/ MergePlan\r\n  type TryVcs[A] = VcsFailure \\/ A\r\n  type VcsAction[+A] = EitherT[Task, VcsFailure, A]\r\n  ...\r\n}\r\n````\r\n\r\nthe plugin would pick up the `MergePlan` and the `VcsFailure` from `edu.gemini.sp.vcs` instead of `edu.gemini.sp.vcs.diff`. The change simply performs the following renaming:\r\n\r\n````\r\n  edu.gemini.sp.vcs.MergePlan -> edu.gemini.sp.vcs.OldMergePlan\r\n  edu.gemini.sp.vcs.VcsFailure -> edu.gemini.sp.vcs.OldVcsFailure\r\n  edu.gemini.sp.vcs.VcsFailure.VcsException -> edu.gemini.sp.vcs.OldVcsFailure.OldVcsException\r\n\r\n````\r\n\r\nYou might want to ignore the details of the code itself because when the new algorithm is complete these classes along with everything else in `edu.gemini.sp.vcs.*` will be deleted anyway.","created_at":"2015-03-10T16:07:40Z","updated_at":"2015-03-10T16:15:50Z","closed_at":"2015-03-10T16:15:50Z","merged_at":"2015-03-10T16:15:50Z","merge_commit_sha":"e33e7171d67ce5159beb25a60ad251c607fa700d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/281/commits","review_comments_url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/281/comments","review_comment_url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues/281/comments","statuses_url":"https://api.github.com/repos/gemini-hlsw/ocs/statuses/118d273b6e09286129ab52249ad5fbd94eff6648","head":{"label":"swalker2m:feature/OCSADV-200-I","ref":"feature/OCSADV-200-I","sha":"118d273b6e09286129ab52249ad5fbd94eff6648","user":{"login":"swalker2m","id":4906023,"avatar_url":"https://avatars.githubusercontent.com/u/4906023?v=3","gravatar_id":"","url":"https://api.github.com/users/swalker2m","html_url":"https://github.com/swalker2m","followers_url":"https://api.github.com/users/swalker2m/followers","following_url":"https://api.github.com/users/swalker2m/following{/other_user}","gists_url":"https://api.github.com/users/swalker2m/gists{/gist_id}","starred_url":"https://api.github.com/users/swalker2m/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/swalker2m/subscriptions","organizations_url":"https://api.github.com/users/swalker2m/orgs","repos_url":"https://api.github.com/users/swalker2m/repos","events_url":"https://api.github.com/users/swalker2m/events{/privacy}","received_events_url":"https://api.github.com/users/swalker2m/received_events","type":"User","site_admin":false},"repo":{"id":23966397,"name":"ocs","full_name":"swalker2m/ocs","owner":{"login":"swalker2m","id":4906023,"avatar_url":"https://avatars.githubusercontent.com/u/4906023?v=3","gravatar_id":"","url":"https://api.github.com/users/swalker2m","html_url":"https://github.com/swalker2m","followers_url":"https://api.github.com/users/swalker2m/followers","following_url":"https://api.github.com/users/swalker2m/following{/other_user}","gists_url":"https://api.github.com/users/swalker2m/gists{/gist_id}","starred_url":"https://api.github.com/users/swalker2m/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/swalker2m/subscriptions","organizations_url":"https://api.github.com/users/swalker2m/orgs","repos_url":"https://api.github.com/users/swalker2m/repos","events_url":"https://api.github.com/users/swalker2m/events{/privacy}","received_events_url":"https://api.github.com/users/swalker2m/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/swalker2m/ocs","description":"","fork":true,"url":"https://api.github.com/repos/swalker2m/ocs","forks_url":"https://api.github.com/repos/swalker2m/ocs/forks","keys_url":"https://api.github.com/repos/swalker2m/ocs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/swalker2m/ocs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/swalker2m/ocs/teams","hooks_url":"https://api.github.com/repos/swalker2m/ocs/hooks","issue_events_url":"https://api.github.com/repos/swalker2m/ocs/issues/events{/number}","events_url":"https://api.github.com/repos/swalker2m/ocs/events","assignees_url":"https://api.github.com/repos/swalker2m/ocs/assignees{/user}","branches_url":"https://api.github.com/repos/swalker2m/ocs/branches{/branch}","tags_url":"https://api.github.com/repos/swalker2m/ocs/tags","blobs_url":"https://api.github.com/repos/swalker2m/ocs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/swalker2m/ocs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/swalker2m/ocs/git/refs{/sha}","trees_url":"https://api.github.com/repos/swalker2m/ocs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/swalker2m/ocs/statuses/{sha}","languages_url":"https://api.github.com/repos/swalker2m/ocs/languages","stargazers_url":"https://api.github.com/repos/swalker2m/ocs/stargazers","contributors_url":"https://api.github.com/repos/swalker2m/ocs/contributors","subscribers_url":"https://api.github.com/repos/swalker2m/ocs/subscribers","subscription_url":"https://api.github.com/repos/swalker2m/ocs/subscription","commits_url":"https://api.github.com/repos/swalker2m/ocs/commits{/sha}","git_commits_url":"https://api.github.com/repos/swalker2m/ocs/git/commits{/sha}","comments_url":"https://api.github.com/repos/swalker2m/ocs/comments{/number}","issue_comment_url":"https://api.github.com/repos/swalker2m/ocs/issues/comments{/number}","contents_url":"https://api.github.com/repos/swalker2m/ocs/contents/{+path}","compare_url":"https://api.github.com/repos/swalker2m/ocs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/swalker2m/ocs/merges","archive_url":"https://api.github.com/repos/swalker2m/ocs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/swalker2m/ocs/downloads","issues_url":"https://api.github.com/repos/swalker2m/ocs/issues{/number}","pulls_url":"https://api.github.com/repos/swalker2m/ocs/pulls{/number}","milestones_url":"https://api.github.com/repos/swalker2m/ocs/milestones{/number}","notifications_url":"https://api.github.com/repos/swalker2m/ocs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/swalker2m/ocs/labels{/name}","releases_url":"https://api.github.com/repos/swalker2m/ocs/releases{/id}","created_at":"2014-09-12T15:41:27Z","updated_at":"2015-03-10T15:24:48Z","pushed_at":"2015-03-10T15:46:25Z","git_url":"git://github.com/swalker2m/ocs.git","ssh_url":"git@github.com:swalker2m/ocs.git","clone_url":"https://github.com/swalker2m/ocs.git","svn_url":"https://github.com/swalker2m/ocs","homepage":null,"size":258212,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"gemini-hlsw:develop","ref":"develop","sha":"bd07121387a1f81743f6c4c01820b4395199a7f3","user":{"login":"gemini-hlsw","id":8593735,"avatar_url":"https://avatars.githubusercontent.com/u/8593735?v=3","gravatar_id":"","url":"https://api.github.com/users/gemini-hlsw","html_url":"https://github.com/gemini-hlsw","followers_url":"https://api.github.com/users/gemini-hlsw/followers","following_url":"https://api.github.com/users/gemini-hlsw/following{/other_user}","gists_url":"https://api.github.com/users/gemini-hlsw/gists{/gist_id}","starred_url":"https://api.github.com/users/gemini-hlsw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gemini-hlsw/subscriptions","organizations_url":"https://api.github.com/users/gemini-hlsw/orgs","repos_url":"https://api.github.com/users/gemini-hlsw/repos","events_url":"https://api.github.com/users/gemini-hlsw/events{/privacy}","received_events_url":"https://api.github.com/users/gemini-hlsw/received_events","type":"Organization","site_admin":false},"repo":{"id":23963494,"name":"ocs","full_name":"gemini-hlsw/ocs","owner":{"login":"gemini-hlsw","id":8593735,"avatar_url":"https://avatars.githubusercontent.com/u/8593735?v=3","gravatar_id":"","url":"https://api.github.com/users/gemini-hlsw","html_url":"https://github.com/gemini-hlsw","followers_url":"https://api.github.com/users/gemini-hlsw/followers","following_url":"https://api.github.com/users/gemini-hlsw/following{/other_user}","gists_url":"https://api.github.com/users/gemini-hlsw/gists{/gist_id}","starred_url":"https://api.github.com/users/gemini-hlsw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gemini-hlsw/subscriptions","organizations_url":"https://api.github.com/users/gemini-hlsw/orgs","repos_url":"https://api.github.com/users/gemini-hlsw/repos","events_url":"https://api.github.com/users/gemini-hlsw/events{/privacy}","received_events_url":"https://api.github.com/users/gemini-hlsw/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/gemini-hlsw/ocs","description":"Observatory Control Software","fork":false,"url":"https://api.github.com/repos/gemini-hlsw/ocs","forks_url":"https://api.github.com/repos/gemini-hlsw/ocs/forks","keys_url":"https://api.github.com/repos/gemini-hlsw/ocs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gemini-hlsw/ocs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gemini-hlsw/ocs/teams","hooks_url":"https://api.github.com/repos/gemini-hlsw/ocs/hooks","issue_events_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues/events{/number}","events_url":"https://api.github.com/repos/gemini-hlsw/ocs/events","assignees_url":"https://api.github.com/repos/gemini-hlsw/ocs/assignees{/user}","branches_url":"https://api.github.com/repos/gemini-hlsw/ocs/branches{/branch}","tags_url":"https://api.github.com/repos/gemini-hlsw/ocs/tags","blobs_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/refs{/sha}","trees_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gemini-hlsw/ocs/statuses/{sha}","languages_url":"https://api.github.com/repos/gemini-hlsw/ocs/languages","stargazers_url":"https://api.github.com/repos/gemini-hlsw/ocs/stargazers","contributors_url":"https://api.github.com/repos/gemini-hlsw/ocs/contributors","subscribers_url":"https://api.github.com/repos/gemini-hlsw/ocs/subscribers","subscription_url":"https://api.github.com/repos/gemini-hlsw/ocs/subscription","commits_url":"https://api.github.com/repos/gemini-hlsw/ocs/commits{/sha}","git_commits_url":"https://api.github.com/repos/gemini-hlsw/ocs/git/commits{/sha}","comments_url":"https://api.github.com/repos/gemini-hlsw/ocs/comments{/number}","issue_comment_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues/comments{/number}","contents_url":"https://api.github.com/repos/gemini-hlsw/ocs/contents/{+path}","compare_url":"https://api.github.com/repos/gemini-hlsw/ocs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gemini-hlsw/ocs/merges","archive_url":"https://api.github.com/repos/gemini-hlsw/ocs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gemini-hlsw/ocs/downloads","issues_url":"https://api.github.com/repos/gemini-hlsw/ocs/issues{/number}","pulls_url":"https://api.github.com/repos/gemini-hlsw/ocs/pulls{/number}","milestones_url":"https://api.github.com/repos/gemini-hlsw/ocs/milestones{/number}","notifications_url":"https://api.github.com/repos/gemini-hlsw/ocs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gemini-hlsw/ocs/labels{/name}","releases_url":"https://api.github.com/repos/gemini-hlsw/ocs/releases{/id}","created_at":"2014-09-12T14:20:23Z","updated_at":"2015-03-10T16:15:51Z","pushed_at":"2015-03-10T16:15:50Z","git_url":"git://github.com/gemini-hlsw/ocs.git","ssh_url":"git@github.com:gemini-hlsw/ocs.git","clone_url":"https://github.com/gemini-hlsw/ocs.git","svn_url":"https://github.com/gemini-hlsw/ocs","homepage":"","size":264930,"stargazers_count":2,"watchers_count":2,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":8,"mirror_url":null,"open_issues_count":2,"forks":8,"open_issues":2,"watchers":2,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/281"},"html":{"href":"https://github.com/gemini-hlsw/ocs/pull/281"},"issue":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/issues/281"},"comments":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/issues/281/comments"},"review_comments":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/281/comments"},"review_comment":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/pulls/281/commits"},"statuses":{"href":"https://api.github.com/repos/gemini-hlsw/ocs/statuses/118d273b6e09286129ab52249ad5fbd94eff6648"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"swalker2m","id":4906023,"avatar_url":"https://avatars.githubusercontent.com/u/4906023?v=3","gravatar_id":"","url":"https://api.github.com/users/swalker2m","html_url":"https://github.com/swalker2m","followers_url":"https://api.github.com/users/swalker2m/followers","following_url":"https://api.github.com/users/swalker2m/following{/other_user}","gists_url":"https://api.github.com/users/swalker2m/gists{/gist_id}","starred_url":"https://api.github.com/users/swalker2m/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/swalker2m/subscriptions","organizations_url":"https://api.github.com/users/swalker2m/orgs","repos_url":"https://api.github.com/users/swalker2m/repos","events_url":"https://api.github.com/users/swalker2m/events{/privacy}","received_events_url":"https://api.github.com/users/swalker2m/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"commits":1,"additions":150,"deletions":150,"changed_files":28}}