mirror of
https://gerrit.googlesource.com/git-repo
synced 2026-09-25 00:01:43 +00:00
Gavin Mak
5e8d2a6e3a
Git 2.32 added the %(describe) pretty placeholder. Use one log format to retrieve both repo's describe string and commit date on newer clients, with the existing describe-plus-log path retained for older Git and untagged output. Bug: 553599402 Change-Id: I108346030677b2b90ef8bfb5acea1c45be2c85f2 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/623904 Tested-by: Gavin Mak <gavinmak@google.com> Commit-Queue: Gavin Mak <gavinmak@google.com> Reviewed-by: Brian Gan <brgan@google.com>
53 lines
1.8 KiB
Python
53 lines
1.8 KiB
Python
# Copyright (C) 2026 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""Unittests for subcmds/version.py."""
|
|
|
|
from unittest import mock
|
|
|
|
import pytest
|
|
|
|
from subcmds import version
|
|
|
|
|
|
def test_repo_version_uses_one_pretty_format_call(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
project = mock.MagicMock()
|
|
project.bare_git.log.return_value = "v2.0-1-g12345678\nTue, 25 Aug\n"
|
|
monkeypatch.setattr(version, "git_require", lambda _version: True)
|
|
|
|
result = version.Version._RepoVersion(project)
|
|
|
|
assert result == ("v2.0-1-g12345678", "Tue, 25 Aug")
|
|
project.bare_git.log.assert_called_once_with(
|
|
"-1", "--format=%(describe)%n%cD", "HEAD"
|
|
)
|
|
project.bare_git.describe.assert_not_called()
|
|
|
|
|
|
def test_repo_version_keeps_old_git_fallback(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
project = mock.MagicMock()
|
|
project.bare_git.describe.return_value = "v2.0"
|
|
project.bare_git.log.return_value = "Tue, 25 Aug"
|
|
monkeypatch.setattr(version, "git_require", lambda _version: False)
|
|
|
|
result = version.Version._RepoVersion(project)
|
|
|
|
assert result == ("v2.0", "Tue, 25 Aug")
|
|
project.bare_git.describe.assert_called_once_with("HEAD")
|
|
project.bare_git.log.assert_called_once_with("-1", "--format=%cD", "HEAD")
|