1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287
|
# Copyright 2010-2025 The pygit2 contributors
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License, version 2,
# as published by the Free Software Foundation.
#
# In addition to the permissions in the GNU General Public License,
# the authors give you unlimited permission to link the compiled
# version of this file into combinations with other programs,
# and to distribute those combinations without any restriction
# coming from the use of this file. (The General Public License
# restrictions do apply in other respects; for example, they cover
# modification of the file, and distribution when not linked into
# a combined executable.)
#
# This file is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
"""Tests for Commit objects."""
import sys
import pytest
from pygit2 import Signature, Oid, GitError
from pygit2.enums import ObjectType
from . import utils
COMMIT_SHA = '5fe808e8953c12735680c257f56600cb0de44b10'
COMMIT_SHA_TO_AMEND = (
'784855caf26449a1914d2cf62d12b9374d76ae78' # tip of the master branch
)
@utils.requires_refcount
def test_commit_refcount(barerepo):
commit = barerepo[COMMIT_SHA]
start = sys.getrefcount(commit)
tree = commit.tree
del tree
end = sys.getrefcount(commit)
assert start == end
def test_read_commit(barerepo):
commit = barerepo[COMMIT_SHA]
assert COMMIT_SHA == commit.id
parents = commit.parents
assert 1 == len(parents)
assert 'c2792cfa289ae6321ecf2cd5806c2194b0fd070c' == parents[0].id
assert commit.message_encoding is None
assert commit.message == (
'Second test data commit.\n\nThis commit has some additional text.\n'
)
commit_time = 1288481576
assert commit_time == commit.commit_time
assert commit.committer == Signature(
'Dave Borowitz', 'dborowitz@google.com', commit_time, -420
)
assert commit.author == Signature(
'Dave Borowitz', 'dborowitz@google.com', 1288477363, -420
)
assert '967fce8df97cc71722d3c2a5930ef3e6f1d27b12' == commit.tree.id
def test_new_commit(barerepo):
repo = barerepo
message = 'New commit.\n\nMessage with non-ascii chars: ééé.\n'
committer = Signature('John Doe', 'jdoe@example.com', 12346, 0)
author = Signature(
'J. David Ibáñez', 'jdavid@example.com', 12345, 0, encoding='utf-8'
)
tree = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
tree_prefix = tree[:5]
too_short_prefix = tree[:3]
parents = [COMMIT_SHA[:5]]
with pytest.raises(ValueError):
repo.create_commit(None, author, committer, message, too_short_prefix, parents)
sha = repo.create_commit(None, author, committer, message, tree_prefix, parents)
commit = repo[sha]
assert ObjectType.COMMIT == commit.type
assert '98286caaab3f1fde5bf52c8369b2b0423bad743b' == commit.id
assert commit.message_encoding is None
assert message == commit.message
assert 12346 == commit.commit_time
assert committer == commit.committer
assert author == commit.author
assert tree == commit.tree.id
assert Oid(hex=tree) == commit.tree_id
assert 1 == len(commit.parents)
assert COMMIT_SHA == commit.parents[0].id
assert Oid(hex=COMMIT_SHA) == commit.parent_ids[0]
def test_new_commit_encoding(barerepo):
repo = barerepo
encoding = 'iso-8859-1'
message = 'New commit.\n\nMessage with non-ascii chars: ééé.\n'
committer = Signature('John Doe', 'jdoe@example.com', 12346, 0, encoding)
author = Signature('J. David Ibáñez', 'jdavid@example.com', 12345, 0, encoding)
tree = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
tree_prefix = tree[:5]
parents = [COMMIT_SHA[:5]]
sha = repo.create_commit(
None, author, committer, message, tree_prefix, parents, encoding
)
commit = repo[sha]
assert ObjectType.COMMIT == commit.type
assert 'iso-8859-1' == commit.message_encoding
assert message.encode(encoding) == commit.raw_message
assert 12346 == commit.commit_time
assert committer == commit.committer
assert author == commit.author
assert tree == commit.tree.id
assert Oid(hex=tree) == commit.tree_id
assert 1 == len(commit.parents)
assert COMMIT_SHA == commit.parents[0].id
assert Oid(hex=COMMIT_SHA) == commit.parent_ids[0]
def test_modify_commit(barerepo):
message = 'New commit.\n\nMessage.\n'
committer = ('John Doe', 'jdoe@example.com', 12346)
author = ('Jane Doe', 'jdoe2@example.com', 12345)
commit = barerepo[COMMIT_SHA]
with pytest.raises(AttributeError):
setattr(commit, 'message', message)
with pytest.raises(AttributeError):
setattr(commit, 'committer', committer)
with pytest.raises(AttributeError):
setattr(commit, 'author', author)
with pytest.raises(AttributeError):
setattr(commit, 'tree', None)
with pytest.raises(AttributeError):
setattr(commit, 'parents', None)
def test_amend_commit_metadata(barerepo):
repo = barerepo
commit = repo[COMMIT_SHA_TO_AMEND]
assert commit.id == repo.head.target
encoding = 'iso-8859-1'
amended_message = 'Amended commit message.\n\nMessage with non-ascii chars: ééé.\n'
amended_author = Signature(
'Jane Author', 'jane@example.com', 12345, 0, encoding=encoding
)
amended_committer = Signature(
'John Committer', 'john@example.com', 12346, 0, encoding=encoding
)
amended_oid = repo.amend_commit(
commit,
'HEAD',
message=amended_message,
author=amended_author,
committer=amended_committer,
encoding=encoding,
)
amended_commit = repo[amended_oid]
assert repo.head.target == amended_oid
assert ObjectType.COMMIT == amended_commit.type
assert amended_committer == amended_commit.committer
assert amended_author == amended_commit.author
assert amended_message.encode(encoding) == amended_commit.raw_message
assert commit.author != amended_commit.author
assert commit.committer != amended_commit.committer
assert commit.tree == amended_commit.tree # we didn't touch the tree
def test_amend_commit_tree(barerepo):
repo = barerepo
commit = repo[COMMIT_SHA_TO_AMEND]
assert commit.id == repo.head.target
tree = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
tree_prefix = tree[:5]
amended_oid = repo.amend_commit(commit, 'HEAD', tree=tree_prefix)
amended_commit = repo[amended_oid]
assert repo.head.target == amended_oid
assert ObjectType.COMMIT == amended_commit.type
assert commit.message == amended_commit.message
assert commit.author == amended_commit.author
assert commit.committer == amended_commit.committer
assert commit.tree_id != amended_commit.tree_id
assert Oid(hex=tree) == amended_commit.tree_id
def test_amend_commit_not_tip_of_branch(barerepo):
repo = barerepo
# This commit isn't at the tip of the branch.
commit = repo['5fe808e8953c12735680c257f56600cb0de44b10']
assert commit.id != repo.head.target
# Can't update HEAD to the rewritten commit because it's not the tip of the branch.
with pytest.raises(GitError):
repo.amend_commit(commit, 'HEAD', message="this won't work!")
# We can still amend the commit if we don't try to update a ref.
repo.amend_commit(commit, None, message='this will work')
def test_amend_commit_no_op(barerepo):
repo = barerepo
commit = repo[COMMIT_SHA_TO_AMEND]
assert commit.id == repo.head.target
amended_oid = repo.amend_commit(commit, None)
assert amended_oid == commit.id
def test_amend_commit_argument_types(barerepo):
repo = barerepo
some_tree = repo['967fce8df97cc71722d3c2a5930ef3e6f1d27b12']
commit = repo[COMMIT_SHA_TO_AMEND]
alt_commit1 = Oid(hex=COMMIT_SHA_TO_AMEND)
alt_commit2 = COMMIT_SHA_TO_AMEND
alt_tree = some_tree
alt_refname = (
repo.head
) # try this one last, because it'll change the commit at the tip
# Pass bad values/types for the commit
with pytest.raises(ValueError):
repo.amend_commit(None, None)
with pytest.raises(TypeError):
repo.amend_commit(some_tree, None)
# Pass bad types for signatures
with pytest.raises(TypeError):
repo.amend_commit(commit, None, author='Toto')
with pytest.raises(TypeError):
repo.amend_commit(commit, None, committer='Toto')
# Pass bad refnames
with pytest.raises(ValueError):
repo.amend_commit(commit, 'this-ref-doesnt-exist')
with pytest.raises(TypeError):
repo.amend_commit(commit, repo)
# Pass bad trees
with pytest.raises(ValueError):
repo.amend_commit(commit, None, tree="can't parse this")
with pytest.raises(KeyError):
repo.amend_commit(commit, None, tree='baaaaad')
# Pass an Oid for the commit
amended_oid = repo.amend_commit(alt_commit1, None, message='Hello')
amended_commit = repo[amended_oid]
assert ObjectType.COMMIT == amended_commit.type
assert amended_oid != COMMIT_SHA_TO_AMEND
# Pass a str for the commit
amended_oid = repo.amend_commit(alt_commit2, None, message='Hello', tree=alt_tree)
amended_commit = repo[amended_oid]
assert ObjectType.COMMIT == amended_commit.type
assert amended_oid != COMMIT_SHA_TO_AMEND
assert repo[COMMIT_SHA_TO_AMEND].tree != amended_commit.tree
assert alt_tree.id == amended_commit.tree_id
# Pass an actual reference object for refname
# (Warning: the tip of the branch will be altered after this test!)
amended_oid = repo.amend_commit(alt_commit2, alt_refname, message='Hello')
amended_commit = repo[amended_oid]
assert ObjectType.COMMIT == amended_commit.type
assert amended_oid != COMMIT_SHA_TO_AMEND
assert repo.head.target == amended_oid
|