1

比如我有一个文件t.json，内容是：

{
  "a": "abcdefg"
}

文件 t.json 被推送到 master 分支。然后我将一些内容添加到文件中，并签出到一个新分支，因此文件现在看起来像这样：

{
  "a": "abcdefg",
  "b": "mkjuujj"
}

现在我可以使用 PyGithub 比较两个提交。代码是这样的：

WORKING_BRANCH = "my_new_branch"
new_branch_ref_str = "refs/heads/%s" % WORKING_BRANCH
branch_ref = None
all_ref = repo.get_git_refs()

for ref in all_ref:
    if ref.ref == new_branch_ref_str:
        branch_ref = ref
        break

if not branch_ref:
    # create branch from this commit
    b = repo.get_branch("master")
    branch_ref = repo.create_git_ref(ref=new_branch_ref_str,
                                 sha=b.commit.sha)

    last_head = repo.get_branch(WORKING_BRANCH)
    fc = repo.get_file_contents("/t.json", ref=WORKING_BRANCH)
    file = 't.json'
    commit_message = "create a new branch with changes"
    input_file = open(file, 'rb')
    data = input_file.read()


    result = repo.update_file("/t.json",
                          commit_message,
                          data,
                          fc.sha, branch=WORKING_BRANCH)

    diff_url = repo.compare(last_head.commit.sha,
                        result['commit'].sha)

    print diff_url.diff_url

这就是我得到的：

diff --git a/t.json b/t.json
index ef03bf5..b775e51 100644
--- a/t.json
+++ b/t.json
@@ -1,3 +1,4 @@
 {
-  "a": "abcdefg"
+  "a": "abcdefg",
+  "b": "mkjuujj"
 }

我应该怎么做才能使用 PyGithub 将 my_new_branch 合并到 master 分支。非常感谢。真的很感激。

4

1 回答 1

2 
try:
    base = repo.get_branch("master")
    head = repo.get_branch(WORKING_BRANCH)

    merge_to_master = repo.merge("master",
                        head.commit.sha, "merge to master")

except Exception as ex:
    print ex
于 2017-09-22T23:19:52.123 回答