Skip to content

Commit

Permalink
dvc: override replace in HTTPURLInfo to include extra_parts (#4517)
Browse files Browse the repository at this point in the history
* dvc: override replace in HTTPURLInfo to include extra_parts

The objective is to passtrough any parameter configured in http remotes.

fixes #4508

* add unit test for #4508

* Use HTTPURLInfo directly instead of decorator
  • Loading branch information
MetalBlueberry authored Sep 3, 2020
1 parent 1f495d6 commit 79e8e4e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
9 changes: 9 additions & 0 deletions dvc/path_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,15 @@ def __init__(self, url):
self.query = p.query
self.fragment = p.fragment

def replace(self, path=None):
return self.from_parts(
*self._base_parts,
params=self.params,
query=self.query,
fragment=self.fragment,
path=path,
)

@classmethod
def from_parts(
cls,
Expand Down
17 changes: 17 additions & 0 deletions tests/unit/test_path_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,20 @@ def test_https_url_info_str():
def test_path_info_as_posix(mocker, path, as_posix, osname):
mocker.patch("os.name", osname)
assert PathInfo(path).as_posix() == as_posix


def test_url_replace_path():
url = "https://[email protected]/original/path;p=par?q=quer#frag"

u = HTTPURLInfo(url)
new_u = u.replace("/new/path")

assert u.path == "/original/path"
assert new_u.path == "/new/path"

assert u.scheme == new_u.scheme
assert u.host == new_u.host
assert u.user == new_u.user
assert u.params == new_u.params
assert u.query == new_u.query
assert u.fragment == new_u.fragment

0 comments on commit 79e8e4e

Please sign in to comment.