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.

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

Add Repository.applies #1019

Closed
wants to merge 1 commit into from
Closed

Add Repository.applies #1019

wants to merge 1 commit into from

Conversation

ddevault
Copy link
Contributor

To test the applicability of a patch.

GIT_APPLY_CHECK was added in libgit2/libgit2#5227 and shipped in 0.99.0.

src/repository.c Outdated Show resolved Hide resolved
@ddevault
Copy link
Contributor Author

Thanks. It's super cool how CPython is full of silly footguns like that.

To test the applicability of a patch
@ddevault
Copy link
Contributor Author

On a second look, I also took the opportunity to switch it to testing against the index instead of the workdir, so it can be used on bare repos (which is my use-case anyway).

@jdavid
Copy link
Member

jdavid commented Jul 15, 2020

The location should be a parameter. I would keep it simple and make the parameter mandatory (if it had a default it should be GIT_APPLY_LOCATION_WORKDIR, for consistency with Repository_apply).

@ddevault
Copy link
Contributor Author

ddevault commented Jul 15, 2020 via email

@jdavid
Copy link
Member

jdavid commented Jul 15, 2020

Okay, then I will merge it.

@jdavid
Copy link
Member

jdavid commented Jul 15, 2020

umh, I already merged (from the command line) and pushed, but the PR is still open, so closing manually..

@jdavid jdavid closed this Jul 15, 2020
@ddevault
Copy link
Contributor Author

ddevault commented Jul 15, 2020 via email

netbsd-srcmastr referenced this pull request in NetBSD/pkgsrc Oct 22, 2020
Includes a build fix for the updated libgit2 1.1.x, figured it may as well
be updated at the same time.

1.3.0 (2020-09-18)
-------------------------

- New ``Repository.add_submodule(...)``
  `#1011 <https://github.com/libgit2/pygit2/pull/1011>`_

- New ``Repository.applies(...)``
  `#1019 <https://github.com/libgit2/pygit2/pull/1019>`_

- New ``Repository.revparse(...)`` and ``Repository.revparse_ext(...)``
  `#1022 <https://github.com/libgit2/pygit2/pull/1022>`_

- New optional ``flags`` and ``file_flags`` arguments in
  ``Repository.merge_commits`` and ``Repository.merge_trees``
  `#1008 <https://github.com/libgit2/pygit2/pull/1008>`_

- New ``Reference.raw_target``, ``Repository.raw_listall_branches(...)`` and
  ``Repository.raw_listall_references()``; allow bytes in
  ``Repository.lookup_branch(...)`` and ``Repository.diff(...)``
  `#1029 <https://github.com/libgit2/pygit2/pull/1029>`_

- New ``GIT_BLAME_FIRST_PARENT`` and ``GIT_BLAME_USE_MAILMAP`` constants
  `#1031 <https://github.com/libgit2/pygit2/pull/1031>`_

- New ``IndexEntry`` supports ``repr()``, ``str()``, ``==`` and ``!=``
  `#1009 <https://github.com/libgit2/pygit2/pull/1009>`_

- New ``Object`` supports ``repr()``
  `#1022 <https://github.com/libgit2/pygit2/pull/1022>`_

- New accept tuples of strings (not only lists) in a number of places
  `#1025 <https://github.com/libgit2/pygit2/pull/1025>`_

- Fix compatibility with old macOS 10.9
  `#1026 <https://github.com/libgit2/pygit2/issues/1026>`_
  `#1027 <https://github.com/libgit2/pygit2/pull/1027>`_

- Fix check argument type in ``Repository.apply(...)``
  `#1033 <https://github.com/libgit2/pygit2/issues/1033>`_

- Fix raise exception if error in ``Repository.listall_submodules()`` commit 32133974

- Fix a couple of refcount errors in ``OdbBackend.refresh()`` and
  ``Worktree_is_prunable`` commit fed0c19c

- Unit tests
  `#800 <https://github.com/libgit2/pygit2/issues/800>`_
  `#1015 <https://github.com/libgit2/pygit2/pull/1015>`_

- Documentation
  `#705 <https://github.com/libgit2/pygit2/pull/705>`_
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