Skip to content
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

Jump to bottom

Add support for cherrypick() #492

Merged
merged 1 commit into from Feb 14, 2015
Merged

Add support for cherrypick() #492

merged 1 commit into from Feb 14, 2015

Conversation

rnicoll
Copy link
Contributor

@rnicoll rnicoll commented Feb 12, 2015

This adds limited support for the cherrypick() call only (not cherrypick_commit()). Addresses issue #436

Learning Python, cffi and the internal workings of Git at the moment, would appreciate any feedback.

carlosmn
carlosmn reviewed Feb 13, 2015
View reviewed changes
test/test_cherrypick.py
try:
conflicts['.gitignore']
except KeyError:
self.fail("conflicts['.gitignore'] raised KeyError unexpectedly")
Copy link
Member

Choose a reason for hiding this comment

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

You don't need to catch this. If an exception is not caught the testing framework will signal it as an error.

@rnicoll
Copy link
Contributor Author

rnicoll commented Feb 13, 2015

Removed unneeded try-catch and squashed.

@jdavid
Copy link
Member

jdavid commented Feb 13, 2015

Could you please add the new cherrypick method to the documentation (docs/) and to the changelog (README.rst)?

@jdavid jdavid merged commit c91fdf1 into libgit2:master Feb 14, 2015
@jdavid
Copy link
Member

jdavid commented Feb 14, 2015

just updated myself, thanks!

@jdavid jdavid mentioned this pull request Feb 14, 2015
Closed
@rnicoll
Copy link
Contributor Author

rnicoll commented Feb 14, 2015

Cool, was on my to-do list, but.... yeah, juggling projects. Quick question, the .rst files look like they're generated automatically, but I'm not yet familiar enough with Python to know convention here. If they are, can you give me a pointer on where to start reading?

Will come back and get cherrypick-commit later!

@jdavid
Copy link
Member

jdavid commented Feb 15, 2015

No, the .rst files (together with the docstrings) are the source of the documentation. To build the documentation:

$ python setup.py build
$ cd docs/
$ make html

The documentation is done with http://sphinx-doc.org/, give a look.

@carlosmn carlosmn mentioned this pull request Apr 28, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@rnicoll @jdavid @carlosmn