mirror of
https://gerrit.googlesource.com/git-repo
synced 2026-09-26 08:41:54 +00:00
Gavin Mak
83428a9b26
Git --autostash predates repo's minimum supported client. Pass it directly to rebase instead of probing the index and separately running stash and stash pop, reducing the dirty path from four Git processes to one and correctly covering staged-only changes. Bug: 553599402 Change-Id: I0d6d59b17996576310498e9378e49380d355236e Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/623902 Tested-by: Gavin Mak <gavinmak@google.com> Reviewed-by: Brian Gan <brgan@google.com> Commit-Queue: Gavin Mak <gavinmak@google.com>
92 lines
2.9 KiB
Python
92 lines
2.9 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 the subcmds/rebase.py module."""
|
|
|
|
import contextlib
|
|
import io
|
|
from types import SimpleNamespace
|
|
from unittest import mock
|
|
|
|
from error import GitError
|
|
from subcmds import rebase
|
|
|
|
|
|
def test_resolve_onto_manifest_success() -> None:
|
|
"""Test _ResolveOntoManifest when ToLocal succeeds."""
|
|
project = mock.MagicMock()
|
|
project.revisionExpr = "main"
|
|
|
|
remote = mock.MagicMock()
|
|
remote.ToLocal.return_value = "refs/remotes/goog/main"
|
|
project.GetRemote.return_value = remote
|
|
|
|
res = rebase._ResolveOntoManifest(project)
|
|
assert res == "refs/remotes/goog/main"
|
|
project.GetRemote.assert_called_once()
|
|
remote.ToLocal.assert_called_once_with("main")
|
|
|
|
|
|
def test_resolve_onto_manifest_fallback() -> None:
|
|
"""Test _ResolveOntoManifest when ToLocal raises GitError."""
|
|
project = mock.MagicMock()
|
|
project.revisionExpr = "main"
|
|
|
|
remote = mock.MagicMock()
|
|
remote.ToLocal.side_effect = GitError("Failed to resolve")
|
|
project.GetRemote.return_value = remote
|
|
|
|
res = rebase._ResolveOntoManifest(project)
|
|
assert res == "main"
|
|
project.GetRemote.assert_called_once()
|
|
remote.ToLocal.assert_called_once_with("main")
|
|
|
|
|
|
def test_execute_delegates_autostash_to_rebase() -> None:
|
|
"""--auto-stash is one rebase process, including staged-only changes."""
|
|
cmd = rebase.Rebase()
|
|
cmd.manifest = mock.MagicMock()
|
|
cmd.git_event_log = mock.MagicMock()
|
|
project = mock.MagicMock()
|
|
project.CurrentBranch = "topic"
|
|
project.RelPath.return_value = "project"
|
|
branch = mock.MagicMock()
|
|
branch.LocalMerge = "refs/remotes/origin/main"
|
|
project.GetBranch.return_value = branch
|
|
cmd.GetProjects = mock.MagicMock(return_value=[project])
|
|
opt = SimpleNamespace(
|
|
interactive=False,
|
|
fail_fast=False,
|
|
whitespace=None,
|
|
quiet=False,
|
|
force_rebase=False,
|
|
ff=True,
|
|
autosquash=False,
|
|
auto_stash=True,
|
|
onto_manifest=False,
|
|
this_manifest_only=False,
|
|
)
|
|
git_command = mock.MagicMock()
|
|
git_command.Wait.return_value = 0
|
|
|
|
with mock.patch.object(
|
|
rebase, "GitCommand", return_value=git_command
|
|
) as run_git, contextlib.redirect_stdout(io.StringIO()):
|
|
assert cmd.Execute(opt, []) == 0
|
|
|
|
run_git.assert_called_once_with(
|
|
project,
|
|
["rebase", "--autostash", "refs/remotes/origin/main"],
|
|
)
|