GeezerVisonThe World Wide Web, restored to 800 pixels of glory. |
| Home|About|Gaming cabinet|Archives|How it works|Starter sites |
GeezerVison is showing github.com — GitPython/test/test_rev_parse.py at refs/heads/main · gitpython-developers/GitPython Expand file tree/ Copy pathtest_rev_parse.pyMore file actions 305 lines (249 loc) · 10.4 KB / Copy pathtest_rev_parse.pyFile metadata and controls305 lines (249 loc) · 10.4 KB 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 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 # Copyright (C) 2026 Michael Trier ([email protected]) and contributors # # This module is part of GitPython and is released under the # 3-Clause BSD License: https://opensource.org/license/bsd-3-clause/ import os import subprocess import sys from pathlib import Path import pytest from gitdb.exc import BadName from git import Commit, Repo, GitCommandError from test.lib.fixtures import fixture_repo, read_only_fixture def _write(repo, path, content): full_path = Path(repo.working_tree_dir) / path full_path.parent.mkdir(parents=True, exist_ok=True) full_path.write_text(content) repo.index.add([str(full_path)]) @pytest.fixture(scope="module") def rev_parse_baseline(): return read_only_fixture("rev-parse.sh", "baseline") / "repo" @pytest.fixture def rev_parse_repo(request): name = request.node.originalname.removeprefix("test_") scenario = ( name if name in { "rev_parse_reflog_selectors", "rev_parse_preserves_path_metadata_with_colons", "rev_parse_commit_message_literal_bang_and_option", "rev_parse_commit_message_escaped_braces", } else "baseline" ) with fixture_repo("rev-parse.sh", scenario, write=name == "rev_parse_copies_are_isolated") as repo: commits = dict( line.split() for line in (Path(repo.working_tree_dir).parent / "commits").read_text().splitlines() ) yield {"repo": repo, "main": repo.heads.main, **{key: repo.commit(sha) for key, sha in commits.items()}} def test_rev_parse_copies_are_isolated(rev_parse_repo, rev_parse_baseline): repo = rev_parse_repo["repo"] path = rev_parse_baseline repo.create_tag("private-copy") _write(repo, "README.md", "private") repo.index.commit("private commit") with Repo(path) as baseline: assert "private-copy" not in baseline.tags assert baseline.head.commit == rev_parse_repo["merge"] assert Path(path, "README.md").read_text() == "release\n" def test_rev_parse_names_hex_and_describe_forms(rev_parse_repo): repo = rev_parse_repo["repo"] release = rev_parse_repo["release"] merge = rev_parse_repo["merge"] assert repo.rev_parse("@") == merge assert repo.rev_parse("@foo") == merge assert repo.rev_parse("aaaaaaaa") == merge assert repo.rev_parse(merge.hexsha[:7]) == merge describe_name = "anything-9-g%s" % merge.hexsha[:7] assert repo.rev_parse("v1.0-1-g%s" % merge.hexsha[:7]) == merge assert repo.rev_parse(describe_name) == merge # Git does not treat an abbreviated ID with a -dirty suffix as a revision. with pytest.raises(BadName): repo.rev_parse("%s-dirty" % merge.hexsha[:7]) with fixture_repo("rev-parse.sh", "describe-collision") as collision: assert collision.rev_parse(describe_name).hexsha == release.hexsha def test_rev_parse_hex_prefix_with_arbitrary_suffix(): with fixture_repo("rev-parse.sh", "hex-prefix-collision") as repo: prefix = (Path(repo.working_tree_dir).parent / "hex-prefix").read_text().strip() name = prefix + "-topic" assert repo.rev_parse(name).hexsha == repo.git.rev_parse("--verify", name) missing = prefix + "-missing" with pytest.raises(GitCommandError): repo.git.rev_parse("--verify", missing) with pytest.raises(BadName): repo.rev_parse(missing) def test_rev_parse_navigation_and_peeling(rev_parse_repo): repo = rev_parse_repo["repo"] root = rev_parse_repo["root"] release = rev_parse_repo["release"] side = rev_parse_repo["side"] merge = rev_parse_repo["merge"] tag = repo.rev_parse("ann") assert repo.rev_parse("HEAD^0") == merge assert repo.rev_parse("HEAD~0") == merge assert repo.rev_parse("HEAD^1") == release assert repo.rev_parse("HEAD^2") == side assert repo.rev_parse("HEAD~") == release assert repo.rev_parse("HEAD^^") == root assert tag.type == "tag" assert repo.rev_parse("ann^{object}") == tag assert repo.rev_parse("ann^{tag}") == tag assert repo.rev_parse("ann^{}") == root assert repo.rev_parse("ann^{commit}") == root assert repo.rev_parse("HEAD^{tree}") == merge.tree assert repo.rev_parse("HEAD^{/}") == merge def test_rev_parse_tree_and_index_paths(rev_parse_repo): repo = rev_parse_repo["repo"] merge = rev_parse_repo["merge"] assert repo.rev_parse("HEAD:") == merge.tree assert repo.rev_parse("HEAD:README.md") == merge.tree["README.md"] assert repo.rev_parse("HEAD^{tree}:README.md") == merge.tree["README.md"] assert repo.rev_parse(":README.md").binsha == merge.tree["README.md"].binsha assert repo.rev_parse(":0:README.md").binsha == merge.tree["README.md"].binsha def test_tree_revision_paths(rev_parse_repo): repo = rev_parse_repo["repo"] tree = rev_parse_repo["merge"].tree for revision in (tree.hexsha, "HEAD^{tree}"): root = repo.tree(revision) assert root.path == "" assert root["dir/file.txt"].path == "dir/file.txt" directory = repo.tree("HEAD:dir") assert directory.path == "dir" assert directory["file.txt"].path == "dir/file.txt" def test_rev_parse_reflog_selectors(rev_parse_repo): repo = rev_parse_repo["repo"] merge = rev_parse_repo["merge"] side = rev_parse_repo["side"] main = rev_parse_repo["main"] release = rev_parse_repo["release"] assert repo.rev_parse("@{0}") == merge assert repo.rev_parse("@{+0}") == merge assert repo.rev_parse("@{1}") == release assert repo.rev_parse("%s@{0}" % main.name) == merge assert repo.rev_parse("@{-1}") == side assert repo.rev_parse("%s@{upstream}" % main.name) == merge def test_rev_parse_commit_message_search(rev_parse_repo): repo = rev_parse_repo["repo"] release = rev_parse_repo["release"] merge = rev_parse_repo["merge"] assert repo.rev_parse(":/release") == release assert repo.rev_parse("HEAD^{/release}") == release assert repo.rev_parse("HEAD^{/!-release}") == merge def test_rev_parse_preserves_path_metadata_with_colons(rev_parse_repo): repo = rev_parse_repo["repo"] path = "dir/name:with:colons" commit = repo.head.commit revisions = [f"HEAD:{path}", f"HEAD^{{/message: with colon}}:{path}"] if os.name != "nt": revisions.extend([f":{path}", f":0:{path}"]) for revision in revisions: blob = repo.rev_parse(revision) assert blob == commit.tree[path] assert blob.path == path assert blob.mode == 0o100644 tree = repo.rev_parse("HEAD:dir") assert tree.path == "dir" assert tree.mode == 0o40000 @pytest.mark.parametrize( "revision", [ ":/release[[:space:]]candidate", "HEAD^{/release{1}}", "ann^{/root}", ":/!-release", "HEAD^{/!-release}", "HEAD^{/release}^0", "HEAD^{/release}^{tree}", ], ) def test_rev_parse_commit_message_search_matches_git(rev_parse_repo, revision): repo = rev_parse_repo["repo"] expected = repo.git.rev_parse("--verify", revision) assert repo.rev_parse(revision).hexsha == expected @pytest.mark.parametrize("revision", [":/release", "HEAD^{/release}"]) def test_commit_and_tree_message_search(rev_parse_repo, revision): repo = rev_parse_repo["repo"] release = rev_parse_repo["release"] assert repo.commit(revision) == release assert repo.tree(revision) == release.tree def test_rev_parse_commit_message_literal_bang_and_option(rev_parse_repo): repo = rev_parse_repo["repo"] commit = repo.head.commit assert repo.rev_parse(":/!!urgent") == commit assert repo.rev_parse("HEAD^{/!!urgent}") == commit assert repo.rev_parse(":/--all") == commit assert repo.rev_parse("HEAD^{/--all}") == commit def test_rev_parse_commit_message_escaped_braces(rev_parse_repo): repo = rev_parse_repo["repo"] commit = repo.commit("HEAD^") assert repo.rev_parse(r"HEAD^{/literal\{3\}}") == commit def test_revision_message_search_does_not_backtrack_in_python(): path = read_only_fixture("rev-parse.sh", "backtracking") / "repo" # Run the adversarial expression in a killable process: Python's regex engine # can otherwise hold the GIL indefinitely, including against a short message. subprocess.run( [ sys.executable, "-c", """ import sys from git import Repo from gitdb.exc import BadName with Repo(sys.argv[1]) as repo: for resolve in (repo.rev_parse, repo.commit, repo.tree): for revision in (':/(.+)+ZZZ', 'HEAD^{/(.+)+ZZZ}'): try: resolve(revision) except BadName: pass else: raise AssertionError('Unexpected match: ' + revision) """, str(path), ], check=True, capture_output=True, timeout=5, ) def test_revision_message_search_does_not_deserialize_history(monkeypatch): with fixture_repo("rev-parse.sh", "needle") as repo: commit = repo.head.commit def reject_deserialization(*args, **kwargs): raise AssertionError("Message search must not deserialize commits in Python") monkeypatch.setattr(Commit, "_deserialize", reject_deserialization) assert repo.rev_parse(":/needle") == commit assert repo.rev_parse("HEAD^{/needle}") == commit def test_commit_and_tree_resolve_before_peeling(rev_parse_repo): repo = rev_parse_repo["repo"] root = rev_parse_repo["root"] merge = rev_parse_repo["merge"] assert repo.commit("ann") == root assert repo.tree("ann") == root.tree assert repo.tree("HEAD:dir") == merge.tree["dir"] assert repo.tree("HEAD^{tree}") == merge.tree with pytest.raises(ValueError): repo.commit("HEAD^{tree}") with pytest.raises(ValueError): repo.tree("HEAD:README.md") def test_rev_parse_rejects_invalid_object_specs(rev_parse_repo): repo = rev_parse_repo["repo"] for revision in ( ":", ":/", ":/[", "HEAD^{/[}", ":/!reserved", "HEAD^{/!reserved}", "@{-0}", "HEAD^{invalid}", ":missing", ): # Use the same native grammar, including Git's accepted empty searches. try: expected = repo.git.rev_parse("--verify", "--quiet", "--end-of-options", revision) except GitCommandError: with pytest.raises((BadName, GitCommandError)): repo.rev_parse(revision) else: assert repo.rev_parse(revision).hexsha == expected |
| You are visitor 01402520 — GeezerVison does not store the pages you look up. Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required. |