def commit_and_try_merge2master(git_action, file_content, study_id, auth_info, parent_sha, commit_msg='', merged_sha=None): """Actually make a local Git commit and push it to our remote """ return generic_commit_and_try_merge2master_wf(git_action, file_content, doc_id=study_id, auth_info=auth_info, parent_sha=parent_sha, commit_msg=commit_msg, merged_sha=merged_sha, doctype_display_name="study")
def commit_and_try_merge2master(self, file_content, doc_id, auth_info, parent_sha, commit_msg='', merged_sha=None): from peyotl.git_storage.git_workflow import generic_commit_and_try_merge2master_wf git_action = self.create_git_action(doc_id) resp = generic_commit_and_try_merge2master_wf(git_action, file_content, doc_id, auth_info, parent_sha, commit_msg, merged_sha=merged_sha) if not resp['merge_needed']: self._doc_merged_hook(git_action, doc_id) return resp