Skip to content

Push tags #1279

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.

Sign up for GitHub

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

Merged
fcollonval merged 2 commits into from
Oct 24, 2023
Merged

Push tags #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ad55bb
Push tags
fcollonval Oct 23, 2023
9468779
lint the code
fcollonval Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions jupyterlab_git/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,11 +1235,14 @@ async def push(
auth=None,
set_upstream=False,
force=False,
tags=True,
):
"""
Execute `git push $UPSTREAM $BRANCH`. The choice of upstream and branch is up to the caller.
"""
command = ["git", "push"]
if tags:
command.append("--tags")
if force:
command.append("--force-with-lease")
if set_upstream:
Expand Down
38 changes: 32 additions & 6 deletions jupyterlab_git/tests/test_pushpull.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ async def test_git_push_fail():

# Then
mock_execute.assert_called_once_with(
["git", "push", "test_origin", "HEAD:test_master"],
["git", "push", "--tags", "test_origin", "HEAD:test_master"],
cwd="test_curr_path",
timeout=20,
env={"TEST": "test", "GIT_TERMINAL_PROMPT": "0"},
Expand Down Expand Up @@ -345,7 +345,7 @@ async def test_git_push_with_auth_fail():

# Then
mock_execute_with_authentication.assert_called_once_with(
["git", "push", "test_origin", "HEAD:test_master"],
["git", "push", "--tags", "test_origin", "HEAD:test_master"],
cwd="test_curr_path",
timeout=20,
env={"TEST": "test", "GIT_TERMINAL_PROMPT": "1"},
Expand Down Expand Up @@ -374,7 +374,7 @@ async def test_git_push_success():

# Then
mock_execute.assert_called_once_with(
["git", "push", ".", "HEAD:test_master"],
["git", "push", "--tags", ".", "HEAD:test_master"],
cwd="test_curr_path",
timeout=20,
env={"TEST": "test", "GIT_TERMINAL_PROMPT": "0"},
Expand Down Expand Up @@ -403,7 +403,7 @@ async def test_git_push_with_auth_success():

# Then
mock_execute_with_authentication.assert_called_once_with(
["git", "push", ".", "HEAD:test_master"],
["git", "push", "--tags", ".", "HEAD:test_master"],
cwd="test_curr_path",
timeout=20,
env={"TEST": "test", "GIT_TERMINAL_PROMPT": "1"},
Expand Down Expand Up @@ -466,7 +466,7 @@ async def test_git_push_with_auth_and_cache_credentials():
is_binary=False,
),
call(
["git", "push", ".", "HEAD:test_master"],
["git", "push", "--tags", ".", "HEAD:test_master"],
cwd=test_path,
timeout=20,
env={**os.environ, "GIT_TERMINAL_PROMPT": "1"},
Expand Down Expand Up @@ -511,7 +511,7 @@ async def test_git_push_with_auth_and_cache_credentials_and_existing_credential_
is_binary=False,
),
call(
["git", "push", ".", "HEAD:test_master"],
["git", "push", "--tags", ".", "HEAD:test_master"],
cwd=test_path,
timeout=20,
env={**os.environ, "GIT_TERMINAL_PROMPT": "1"},
Expand All @@ -522,3 +522,29 @@ async def test_git_push_with_auth_and_cache_credentials_and_existing_credential_
]
)
assert {"code": 0, "message": ""} == actual_response


@pytest.mark.asyncio
async def test_git_push_no_tags_success():
with patch("os.environ", {"TEST": "test"}):
with patch("jupyterlab_git.git.execute") as mock_execute:
# Given
output = "output"
mock_execute.return_value = maybe_future((0, output, "does not matter"))

# When
actual_response = await Git().push(
".", "HEAD:test_master", "test_curr_path", tags=False
)

# Then
mock_execute.assert_called_once_with(
["git", "push", ".", "HEAD:test_master"],
cwd="test_curr_path",
timeout=20,
env={"TEST": "test", "GIT_TERMINAL_PROMPT": "0"},
username=None,
password=None,
is_binary=False,
)
assert {"code": 0, "message": output} == actual_response