Skip to content

Conversation

cgumpert
Copy link
Contributor

This is a possible implementation for addressing #235. It allows to cherry pick individual commits through the Gitlab API both from the python code as well as from the command line. The documentation has been updated.

Copy link
Contributor

@gpocentek gpocentek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only 2 nitpicks, but the patch looks good. Could you make the minor changes and I'll merge.

Thank you!

@@ -43,6 +43,12 @@ Get the diff for a commit:
:start-after: # diff
:end-before: # end diff

Cherry-pick a commit into another branch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please end the line with a colon (:) to introduce the example.

GitlabCherryPickError: If the cherry pick could not be applied.
"""
url = '/projects/{0:s}/repository/commits/{1:s}/cherry_pick'.format(
self.project_id, self.id)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the sake of consistency could you use the old %()s format? Yes, this is nitpicking :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had problems with keeping the line length below the limit of 79 characters. I worked around it now by introducing another local variable with a short name. If you have any other suggestion on how to break this string across two lines, I'd be happy to hear.

@gpocentek gpocentek merged commit 22bf128 into python-gitlab:master Mar 21, 2017
@gpocentek
Copy link
Contributor

Thank you for this patch!

@cgumpert cgumpert deleted the cherry_pick_commit branch April 10, 2017 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants