status: add untracked_files and ignored kwargs #1151

dtrifiro · 2022-07-19T10:31:03Z

add ignored and untracked_files kwargs to status.

untracked_files can take be one of "no", "normal", "all", which return respectively: no untracked files, untracked files/directories without recursing into subdirectories, all untracked files/directories.
ignored can be True (show ignored files) or False (do not show ignored files). Whenuntracked_files="no", this does not have any effect.

For more information see --untracked-files and --ignored, see https://book.git-scm.com/docs/git-status

pygit2/_pygit2.pyi

dtrifiro · 2022-07-19T10:39:22Z

test/test_status.py

+    not any(status & pygit2.GIT_STATUS_WT_NEW for status in git_status.values())
+
+
+@pytest.mark.parametrize(


These tests don't actually cover all of the possible scenarios, such as having tracked subdirectories with ignored files, tracked subdirectories with untracked files, untracked subdirectories with ignored files, etc, etc. Might improve these tests soon.

We're just passing the options to libgit2, the purpose of the test suite is not to test libgit2, which already has its own test suite. So better to keep the tests simple, it's good the way they are already.

test/conftest.py

dtrifiro · 2022-07-19T13:42:05Z

Not sure why appveyor failed, one of the errors I'm getting:

failed on setup with "_pygit2.GitError: C:\Users\appveyor\AppData\Local\Temp\1\pytest-of-appveyor\pytest-> 0\test_reference_set_sha0\testrepo: repository path 'C:/Users/appveyor/AppData/Local/Temp/1/pytest-of-appveyor/pytest-0/test_reference_set_sha0/testrepo/' is not owned by current user"

As I'm not able to reproduce this locally, I could use some help there

skshetry · 2022-07-19T16:10:46Z

Not sure why appveyor failed, one of the errors I'm getting:

failed on setup with "_pygit2.GitError: C:\Users\appveyor\AppData\Local\Temp\1\pytest-of-appveyor\pytest-> 0\test_reference_set_sha0\testrepo: repository path 'C:/Users/appveyor/AppData/Local/Temp/1/pytest-of-appveyor/pytest-0/test_reference_set_sha0/testrepo/' is not owned by current user"

As I'm not able to reproduce this locally, I could use some help there

This is also failing on master: https://ci.appveyor.com/project/jdavid/pygit2/builds/44206064/job/83rhjdo521x5uk6e.
#1150 seems to be the relevant PR where it's also failing, due to GIT_OPT_GET_OWNER_VALIDATION being enabled by default.

jdavid · 2022-07-20T20:32:30Z

This is also failing on master [...]

This is now fixed in master, you can rebase to get AppVeyor green.

src/repository.c

test/test_status.py

dtrifiro · 2022-07-21T15:24:35Z

Thanks for the feedback! Updated everything as discussed

jdavid · 2022-07-22T13:29:44Z

Merged, thanks!

1.10.1 (2022-08-28) ------------------------- - Fix segfault in ``Signature`` repr `#1155 <https://github.com/libgit2/pygit2/pull/1155>`_ - Linux and macOS wheels for Python 3.11 `#1154 <https://github.com/libgit2/pygit2/pull/1154>`_ 1.10.0 (2022-07-24) ------------------------- - Upgrade to libgit2 1.5 - Add support for ``GIT_OPT_GET_OWNER_VALIDATION`` and ``GIT_OPT_SET_OWNER_VALIDATION`` `#1150 <https://github.com/libgit2/pygit2/pull/1150>`_ - New ``untracked_files`` and ``ignored`` optional arguments for ``Repository.status(...)`` `#1151 <https://github.com/libgit2/pygit2/pull/1151>`_ 1.9.2 (2022-05-24) ------------------------- - New ``Repository.create_commit_string(...)`` and ``Repository.create_commit_with_signature(...)`` `#1142 <https://github.com/libgit2/pygit2/pull/1142>`_ - Linux and macOS wheels updated to libgit2 v1.4.3 - Remove redundant line `#1139 <https://github.com/libgit2/pygit2/pull/1139>`_ 1.9.1 (2022-03-22) ------------------------- - Type hints: added to C code and Branches/References `#1121 <https://github.com/libgit2/pygit2/pull/1121>`_ `#1132 <https://github.com/libgit2/pygit2/pull/1132>`_ - New ``Signature`` supports ``str()`` and ``repr()`` `#1135 <https://github.com/libgit2/pygit2/pull/1135>`_ - Fix ODB backend's read in big endian architectures `#1130 <https://github.com/libgit2/pygit2/pull/1130>`_ - Fix install with poetry `#1129 <https://github.com/libgit2/pygit2/pull/1129>`_ `#1128 <https://github.com/libgit2/pygit2/issues/1128>`_ - Wheels: update to libgit2 v1.4.2 - Tests: fix testing ``parse_diff`` `#1131 <https://github.com/libgit2/pygit2/pull/1131>`_ - CI: various fixes after migration to libgit2 v1.4 1.9.0 (2022-02-22) ------------------------- - Upgrade to libgit2 v1.4 - Documentation, new recipes for committing and cloning `#1125 <https://github.com/libgit2/pygit2/pull/1125>`_ 1.8.0 (2022-02-04) ------------------------- - Rename ``RemoteCallbacks.progress(...)`` callback to ``.sideband_progress(...)`` `#1120 <https://github.com/libgit2/pygit2/pull/1120>`_ - New ``Repository.merge_base_many(...)`` and ``Repository.merge_base_octopus(...)`` `#1112 <https://github.com/libgit2/pygit2/pull/1112>`_ - New ``Repository.listall_stashes()`` `#1117 <https://github.com/libgit2/pygit2/pull/1117>`_ - Code cleanup `#1118 <https://github.com/libgit2/pygit2/pull/1118>`_ Backward incompatible changes: - The ``RemoteCallbacks.progress(...)`` callback has been renamed to ``RemoteCallbacks.sideband_progress(...)``. This matches the documentation, but may break existing code that still uses the old name. 1.7.2 (2021-12-06) ------------------------- - Universal wheels for macOS `#1109 <https://github.com/libgit2/pygit2/pull/1109>`_ 1.7.1 (2021-11-19) ------------------------- - New ``Repository.amend_commit(...)`` `#1098 <https://github.com/libgit2/pygit2/pull/1098>`_ - New ``Commit.message_trailers`` `#1101 <https://github.com/libgit2/pygit2/pull/1101>`_ - Windows wheels for Python 3.10 `#1103 <https://github.com/libgit2/pygit2/pull/1103>`_ - Changed: now ``DiffDelta.is_binary`` returns ``None`` if the file data has not yet been loaded, cf. `#962 <https://github.com/libgit2/pygit2/issues/962>`_ - Document ``Repository.get_attr(...)`` and update theme `#1017 <https://github.com/libgit2/pygit2/issues/1017>`_ `#1105 <https://github.com/libgit2/pygit2/pull/1105>`_ 1.7.0 (2021-10-08) ------------------------- - Upgrade to libgit2 1.3.0 `#1089 <https://github.com/libgit2/pygit2/pull/1089>`_ - Linux wheels now bundled with libssh2 1.10.0 (instead of 1.9.0) - macOS wheels now include libssh2 - Add support for Python 3.10 `#1092 <https://github.com/libgit2/pygit2/pull/1092>`_ `#1093 <https://github.com/libgit2/pygit2/pull/1093>`_ - Drop support for Python 3.6 - New `pygit2.GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES` `#1087 <https://github.com/libgit2/pygit2/pull/1087>`_ - New optional argument ``location`` in ``Repository.applies(..)`` and ``Repository.apply(..)`` `#1091 <https://github.com/libgit2/pygit2/pull/1091>`_ - Fix: Now the `flags` argument in `Repository.blame()` is passed through `#1083 <https://github.com/libgit2/pygit2/pull/1083>`_ - CI: Stop using Travis, move to GitHub actions Caveats: - Windows wheels for Python 3.10 not yet available.

dtrifiro commented Jul 19, 2022

View reviewed changes

pygit2/_pygit2.pyi Show resolved Hide resolved

dtrifiro commented Jul 19, 2022

View reviewed changes

test/conftest.py Outdated Show resolved Hide resolved

dtrifiro force-pushed the master branch 2 times, most recently from 0fd9713 to 26c0bf9 Compare July 19, 2022 11:03

dtrifiro marked this pull request as ready for review July 20, 2022 08:51

dtrifiro force-pushed the master branch from 26c0bf9 to 3110078 Compare July 20, 2022 20:38

jdavid requested changes Jul 21, 2022

View reviewed changes

src/repository.c Outdated Show resolved Hide resolved

src/repository.c Outdated Show resolved Hide resolved

src/repository.c Outdated Show resolved Hide resolved

test/test_status.py Outdated Show resolved Hide resolved

dtrifiro force-pushed the master branch from 3110078 to 6641aa0 Compare July 21, 2022 12:26

status: add untracked_files and ignored kwargs

fce010d

dtrifiro force-pushed the master branch from 6641aa0 to fce010d Compare July 21, 2022 15:23

jdavid approved these changes Jul 22, 2022

View reviewed changes

jdavid merged commit fce010d into libgit2:master Jul 22, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

status: add untracked_files and ignored kwargs #1151

status: add untracked_files and ignored kwargs #1151

dtrifiro commented Jul 19, 2022 •

edited

Loading

dtrifiro Jul 19, 2022

jdavid Jul 21, 2022

dtrifiro commented Jul 19, 2022 •

edited

Loading

skshetry commented Jul 19, 2022

jdavid commented Jul 20, 2022

dtrifiro commented Jul 21, 2022

jdavid commented Jul 22, 2022

		not any(status & pygit2.GIT_STATUS_WT_NEW for status in git_status.values())


		@pytest.mark.parametrize(

status: add untracked_files and ignored kwargs #1151

status: add untracked_files and ignored kwargs #1151

Conversation

dtrifiro commented Jul 19, 2022 • edited Loading

dtrifiro Jul 19, 2022

Choose a reason for hiding this comment

jdavid Jul 21, 2022

Choose a reason for hiding this comment

dtrifiro commented Jul 19, 2022 • edited Loading

skshetry commented Jul 19, 2022

jdavid commented Jul 20, 2022

dtrifiro commented Jul 21, 2022

jdavid commented Jul 22, 2022

dtrifiro commented Jul 19, 2022 •

edited

Loading

dtrifiro commented Jul 19, 2022 •

edited

Loading