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

BF+RF: AnnexRepo - add set_shared_connection to (effective) set_remote_url #4262

Merged
merged 1 commit into from Mar 9, 2020

Conversation

yarikoptic
Copy link
Member

@yarikoptic yarikoptic commented Mar 9, 2020

(effective) because apparently we had 2 set_remote_url definitions.
Earlier (in time and in the code) was located among other methods dealing
with remotes (thus I kept that location, which also invoked
self._set_shared_connection.

And later one, which added custom to AnnexRepo handling of annexurl, but
lacked invocation of self._set_shared_connection. I took later version,
placed it inplace of the older (earlier in the code) one, while maintaining
the self._set_shared_connection invocation.

This now causes ssh call to have socket defined for target2, so later
enableremote has a better chance to reuse it.

Closes #4195 and has resolved regression/difference in behavior of the recent git-annex-standalone build in #4116

…e_url

(effective) because apparently we had 2 set_remote_url definitions.
Earlier (in time and in the code) was located among other methods dealing
with remotes (thus I kept that location, which also invoked
self._set_shared_connection.

And later one, which added custom to AnnexRepo handling  of annexurl, but
lacked invocation of self._set_shared_connection.  I took later version,
placed it inplace of the older (earlier in the code) one, while maintaining
the self._set_shared_connection invocation.

This now causes ssh call to have socket defined for target2, so later
enableremote has a better chance to reuse it.

The hope is that it would close datalad#4195 and resolve regression/difference
in behavior of the recent git-annex-standalone build in datalad#4116
@codecov
Copy link

@codecov codecov bot commented Mar 9, 2020

Codecov Report

Merging #4262 into maint will increase coverage by 47.12%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##            maint    #4262       +/-   ##
===========================================
+ Coverage   42.55%   89.68%   +47.12%     
===========================================
  Files         275      275               
  Lines       36859    36857        -2     
===========================================
+ Hits        15686    33055    +17369     
+ Misses      21173     3802    -17371
Impacted Files Coverage Δ
datalad/support/annexrepo.py 86.17% <100%> (+35.38%) ⬆️
datalad/core/local/create.py 94.73% <0%> (+0.75%) ⬆️
datalad/core/local/tests/test_create.py 100% <0%> (+0.9%) ⬆️
datalad/ui/progressbars.py 83.1% <0%> (+1.35%) ⬆️
datalad/support/external_versions.py 95.62% <0%> (+1.45%) ⬆️
datalad/dochelpers.py 87.4% <0%> (+1.48%) ⬆️
datalad/support/tests/test_network.py 100% <0%> (+1.83%) ⬆️
datalad/core/local/status.py 98.03% <0%> (+1.96%) ⬆️
datalad/support/tests/test_external_versions.py 91.94% <0%> (+2.01%) ⬆️
datalad/support/json_py.py 98.85% <0%> (+2.29%) ⬆️
... and 186 more

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 3e70bd0...c6934d1. Read the comment docs.

kyleam
kyleam approved these changes Mar 9, 2020
Copy link
Contributor

@kyleam kyleam left a comment

Oy, that took code duplication to a whole other level.

--color-moved confirms that the merged function is the result of pure code movement.

@kyleam kyleam merged commit 89030cb into datalad:maint Mar 9, 2020
14 of 17 checks passed
@yarikoptic yarikoptic deleted the bf-4195 branch Mar 9, 2020
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.

None yet

2 participants