tibdex / github-cherry-pick Goto Github PK

Not able to require and use function

I am interested in solving the problem of cherry-picking using Github's low-level API, too, however in Golang programming language.

I just read the Git Internals chapter of the Pro Git book (great!) and one thing I note is that creating commits using the low-level "plumbing" API does not work with diff/patch but with file content/trees. As such, creating commits by referring to trees using the low-level Github API is not the same as doing a git cherry-pick XXX as it wont handle merge conflicts at all. It is something close to git cherry-pick -Xtheirs XXX with the difference that the new commit XXX will modify the file to look exactly as it looked at commit XXX. Really what you want to do is to extract the diff from XXX^ to XXX, create a new tree based on that and then create a commit.

Are you handling this? I'm by no means a TypeScript expert, but from what I understand in https://github.com/tibdex/github-cherry-pick/blob/master/src/index.ts you are not. Have you considered how to handle it? One way of doing it would be to iteratively do something (in pseudo code)

foreach commit in commit_list:
    newtree = commit.tree
    foreach filediff in commit.modified_files:
        # https://developer.github.com/v3/git/trees/#create-a-tree
        newtree = create_tree(from=newtree, file_content=apply_diff(commit.previous, filediff))

# https://developer.github.com/v3/git/commits/#create-a-commit
create_new_commit(from, newtree)

I understand it would be slower, but it's the correct way of doing it, I think.