Skip to content

modify_and_branch implementation simplified #217

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

modify_and_branch implementation simplified #217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 12 additions & 13 deletions ocflib/infra/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
from github import Github
from github import InputGitTreeElement


class GithubCredentials():
"""Basic class to store Github credentials and verify input"""
Expand Down Expand Up @@ -47,16 +45,17 @@ def get_file(self, filename):
Note that GitHub's API only supports files up to 1MB in size."""
return self._github.get_contents(filename).decoded_content.decode('utf-8')

def modify_and_branch(self, base_branch, new_branch_name, commit_message, filename, file_content):
def modify_and_branch(self, base_branch, new_branch_name, commit_message, file_path, file_contents):
"""Create a new branch from base_branch, makes changes to a file, and
commits it to the new branch."""

base_sha = self._github.get_git_ref('heads/{}'.format(base_branch)).object.sha
base_tree = self._github.get_git_tree(base_sha)
element = InputGitTreeElement(filename, '100644', 'blob', file_content)
tree = self._github.create_git_tree([element], base_tree)

parent = self._github.get_git_commit(base_sha)
commit = self._github.create_git_commit(commit_message, tree, [parent])

self._github.create_git_ref('refs/heads/{}'.format(new_branch_name), commit.sha)

base_sha = self._github.get_branch(base_branch).commit.sha
self._github.create_git_ref('refs/heads/{}'.format(new_branch_name), base_sha)
current_contents = self._github.get_contents(file_path, ref=new_branch_name)
self._github.update_file(file_path,
commit_message,
file_contents,
current_contents.sha,
branch=new_branch_name)