Non-GitPy GitRepo.get_branch_commits() #3834

mih · 2019-10-24T14:21:39Z

This is sitting on top of gh-3833. And aims to be another step towards #2970 by fixing #3813

Sibling PR in the crawler is datalad/datalad-crawler#66

codecov · 2019-10-29T08:42:04Z

Codecov Report

Merging #3834 into master will increase coverage by 0.04%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3834      +/-   ##
==========================================
+ Coverage   89.13%   89.17%   +0.04%     
==========================================
  Files         275      275              
  Lines       35847    35825      -22     
==========================================
- Hits        31953    31948       -5     
+ Misses       3894     3877      -17

Impacted Files	Coverage Δ
datalad/support/tests/test_annexrepo.py	`95.57% <0.00%> (+0.32%)`	⬆️
datalad/downloaders/base.py	`75.55% <0.00%> (+0.37%)`	⬆️
datalad/downloaders/http.py	`74.10% <0.00%> (+0.39%)`	⬆️
datalad/downloaders/tests/test_http.py	`61.80% <0.00%> (+1.21%)`	⬆️
datalad/support/tests/utils.py	`96.15% <0.00%> (+11.53%)`	⬆️
datalad/support/tests/test_cookies.py	`100.00% <0.00%> (+14.28%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bc05be3...c49782b. Read the comment docs.

bpoldrack · 2019-10-29T13:28:27Z

LGTM

kyleam

The changes themselves look fine to me, but the crawler uses get_branch_commits(). So we either need to (1) prepare an adjustment PR against the crawler or (2) keep get_branch_commits() around for now (or both). The crawler already contains several unreleased compatibility fixes, so I think no. 1 would be fine.

Repo classes have no `get_branch_commits()` anymore. The crawler uses the test-helper replacement now. it could eventually also swallow that function into its code base.

mih · 2019-11-29T12:43:26Z

I prepared an adjustment PR for the crawler datalad/datalad-crawler#66

I would merge this when the test have gone through.

yarikoptic · 2019-12-03T17:28:35Z

datalad/tests/utils.py

@@ -1827,6 +1827,37 @@ def newfunc(*args, **kwargs):
    return newfunc


+def get_branch_commits(repo, branch=None, limit=None, stop=None):
+    """Return commit hexshas for a branch


My main question is - why not to keep it as a method (well, rename to get_branch_commits_) of GitRepo and just remove value parameter, thus always yielding hexshas?
or we do not foresee any need for such functionality for anything but the tests? I already see one usecase RFed above in https://github.com/datalad/datalad/pull/3834/files#diff-18445826672fc8f047d0b7d56512986cR327 for direct call to git (IMHO suboptimal to breed those)

The idea here, and in other PRs before, is to get rid all these tiny wrapper around simple git calls and leave them to the return value focused wrappers we have now. I was under the impression that this direction had received general support. I dont see why this particular method should be treated differently.

I have now implemented what you suggested @yarikoptic and adjusted the companion PR in the crawler too.

See datalad/datalad#3834 Compatibility kludges have been put in place, given that the impact on the crawler is just a rename.

and add '_' function name suffix to indicate its generator-behavior. This furthers datalad#2970

mih · 2020-02-20T12:24:04Z

I have dropped all changes that removed this method from the class and turned into a standalone function.
Remaining changes are:

rename to match generator-method convention
stripping the flexibility of the method down to what is needed in core and crawler, and reimplement it with rev-list
adjust usage due to those changes

mih · 2020-02-20T13:53:15Z

As with other PRs the windows github ci failure is unrelated. Crawler failure is addressed in companion PR.

See datalad/datalad#3834 Compatibility kludges have been put in place, given that the impact on the crawler is primarily a rename.

RF: Adjust for datalad/datalad#3834

mih force-pushed the rf-branchcommits branch from dc8ed3d to ee14d57 Compare Oct 29, 2019

mih marked this pull request as ready for review Oct 29, 2019

kyleam reviewed Oct 29, 2019

View changes

mih force-pushed the rf-branchcommits branch from ee14d57 to ccdd2d7 Compare Nov 29, 2019

mih mentioned this pull request Nov 29, 2019

RF: Adjust for https://github.com/datalad/datalad/pull/3834 datalad/datalad-crawler#66

Merged

yarikoptic reviewed Dec 3, 2019

View changes

mih mentioned this pull request Feb 14, 2020

GitPython use in GitRepo API #2970

Closed

15 tasks

mih force-pushed the rf-branchcommits branch 2 times, most recently from b66e98f to b9930f1 Compare Feb 20, 2020

mih added a commit to datalad/datalad-crawler that referenced this issue Feb 20, 2020

RF: Adjust GitRepo.get_branch_commits() -> GitRepo.get_branch_commits_()

894ca4e

See datalad/datalad#3834 Compatibility kludges have been put in place, given that the impact on the crawler is just a rename.

mih force-pushed the rf-branchcommits branch from b9930f1 to f2a0ee1 Compare Feb 20, 2020

mih changed the title ~~Get rid of GitRepo.get_branch_commits() as a non-test-helper~~ Non-GitPy GitRepo.get_branch_commits() Feb 20, 2020

RF: Reimplement GitRepo.get_branch_commits() with git rev-list

c49782b

and add '_' function name suffix to indicate its generator-behavior. This furthers datalad#2970

mih force-pushed the rf-branchcommits branch from f2a0ee1 to c49782b Compare Feb 20, 2020

mih mentioned this pull request Feb 20, 2020

RF: No GitPython use in publish #4171

Merged

mih merged commit 8f4f7c2 into datalad:master Feb 20, 2020
15 of 17 checks passed

mih deleted the rf-branchcommits branch Feb 20, 2020

yarikoptic mentioned this pull request Feb 20, 2020

ENH: list datalad-container extension provided commands #4174

Merged

mih added a commit to datalad/datalad-crawler that referenced this issue Feb 25, 2020

Merge pull request #66 from datalad/rf-getbranchcommits

f4a54c5

RF: Adjust for datalad/datalad#3834

Non-GitPy GitRepo.get_branch_commits() #3834

Non-GitPy GitRepo.get_branch_commits() #3834

mih commented Oct 24, 2019 •

edited

codecov bot commented Oct 29, 2019 •

edited

bpoldrack commented Oct 29, 2019

kyleam left a comment

mih commented Nov 29, 2019

yarikoptic Dec 3, 2019

mih Dec 3, 2019

mih Feb 20, 2020

mih commented Feb 20, 2020

mih commented Feb 20, 2020

Non-GitPy GitRepo.get_branch_commits() #3834

Non-GitPy GitRepo.get_branch_commits() #3834

Conversation

mih commented Oct 24, 2019 • edited

codecov bot commented Oct 29, 2019 • edited

Codecov Report

bpoldrack commented Oct 29, 2019

kyleam left a comment

mih commented Nov 29, 2019

yarikoptic Dec 3, 2019

Choose a reason for hiding this comment

mih Dec 3, 2019

Choose a reason for hiding this comment

mih Feb 20, 2020

Choose a reason for hiding this comment

mih commented Feb 20, 2020

mih commented Feb 20, 2020

mih commented Oct 24, 2019 •

edited

codecov bot commented Oct 29, 2019 •

edited