test_object_store.py 24 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677
  1. # test_object_store.py -- tests for object_store.py
  2. # Copyright (C) 2008 Jelmer Vernooij <jelmer@jelmer.uk>
  3. #
  4. # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  5. # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
  6. # General Public License as published by the Free Software Foundation; version 2.0
  7. # or (at your option) any later version. You can redistribute it and/or
  8. # modify it under the terms of either of these two licenses.
  9. #
  10. # Unless required by applicable law or agreed to in writing, software
  11. # distributed under the License is distributed on an "AS IS" BASIS,
  12. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13. # See the License for the specific language governing permissions and
  14. # limitations under the License.
  15. #
  16. # You should have received a copy of the licenses; if not, see
  17. # <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
  18. # and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
  19. # License, Version 2.0.
  20. #
  21. """Tests for the object store interface."""
  22. from collections.abc import Callable, Iterator, Sequence
  23. from typing import TYPE_CHECKING, Any
  24. from unittest import TestCase
  25. from unittest.mock import patch
  26. from dulwich.index import commit_tree
  27. from dulwich.object_store import (
  28. MemoryObjectStore,
  29. PackBasedObjectStore,
  30. find_shallow,
  31. iter_commit_contents,
  32. iter_tree_contents,
  33. peel_sha,
  34. )
  35. from dulwich.objects import (
  36. Blob,
  37. Commit,
  38. ObjectID,
  39. ShaFile,
  40. Tag,
  41. Tree,
  42. TreeEntry,
  43. )
  44. from dulwich.protocol import DEPTH_INFINITE
  45. from dulwich.refs import Ref
  46. from .utils import make_commit, make_object, make_tag
  47. if TYPE_CHECKING:
  48. from dulwich.object_store import BaseObjectStore
  49. testobject = make_object(Blob, data=b"yummy data")
  50. class ObjectStoreTests:
  51. """Base class for testing object store implementations."""
  52. store: "BaseObjectStore"
  53. assertEqual: Callable[[object, object], None]
  54. # For type checker purposes - actual implementation supports both styles
  55. assertRaises: Callable[..., Any]
  56. assertNotIn: Callable[[object, object], None]
  57. assertNotEqual: Callable[[object, object], None]
  58. assertIn: Callable[[object, object], None]
  59. assertTrue: Callable[[bool], None]
  60. assertFalse: Callable[[bool], None]
  61. def test_determine_wants_all(self) -> None:
  62. """Test determine_wants_all with valid ref."""
  63. self.assertEqual(
  64. [ObjectID(b"1" * 40)],
  65. self.store.determine_wants_all(
  66. {Ref(b"refs/heads/foo"): ObjectID(b"1" * 40)}
  67. ),
  68. )
  69. def test_determine_wants_all_depth(self) -> None:
  70. """Test determine_wants_all with depth parameter."""
  71. self.store.add_object(testobject)
  72. refs = {Ref(b"refs/heads/foo"): testobject.id}
  73. with patch.object(self.store, "_get_depth", return_value=1) as m:
  74. self.assertEqual([], self.store.determine_wants_all(refs, depth=0))
  75. self.assertEqual(
  76. [testobject.id],
  77. self.store.determine_wants_all(refs, depth=DEPTH_INFINITE),
  78. )
  79. m.assert_not_called()
  80. self.assertEqual([], self.store.determine_wants_all(refs, depth=1))
  81. m.assert_called_with(testobject.id)
  82. self.assertEqual(
  83. [testobject.id], self.store.determine_wants_all(refs, depth=2)
  84. )
  85. def test_get_depth(self) -> None:
  86. """Test getting object depth."""
  87. self.assertEqual(0, self.store._get_depth(testobject.id))
  88. self.store.add_object(testobject)
  89. self.assertEqual(
  90. 1, self.store._get_depth(testobject.id, get_parents=lambda x: [])
  91. )
  92. parent = make_object(Blob, data=b"parent data")
  93. self.store.add_object(parent)
  94. self.assertEqual(
  95. 2,
  96. self.store._get_depth(
  97. testobject.id,
  98. get_parents=lambda x: [parent.id] if x == testobject else [],
  99. ),
  100. )
  101. def test_iter(self) -> None:
  102. """Test iterating over empty store."""
  103. self.assertEqual([], list(self.store))
  104. def test_get_nonexistant(self) -> None:
  105. """Test getting non-existent object raises KeyError."""
  106. self.assertRaises(KeyError, lambda: self.store[ObjectID(b"a" * 40)])
  107. def test_contains_nonexistant(self) -> None:
  108. """Test checking for non-existent object."""
  109. self.assertNotIn(b"a" * 40, self.store)
  110. def test_add_objects_empty(self) -> None:
  111. """Test adding empty list of objects."""
  112. self.store.add_objects([])
  113. def test_add_commit(self) -> None:
  114. """Test adding commit objects."""
  115. # TODO: Argh, no way to construct Git commit objects without
  116. # access to a serialized form.
  117. self.store.add_objects([])
  118. def test_store_resilience(self) -> None:
  119. """Test if updating an existing stored object doesn't erase the object from the store."""
  120. test_object = make_object(Blob, data=b"data")
  121. self.store.add_object(test_object)
  122. test_object_id = test_object.id
  123. test_object.data = test_object.data + b"update"
  124. stored_test_object = self.store[test_object_id]
  125. self.assertNotEqual(test_object.id, stored_test_object.id)
  126. self.assertEqual(stored_test_object.id, test_object_id)
  127. def test_add_object(self) -> None:
  128. """Test adding a single object to store."""
  129. self.store.add_object(testobject)
  130. self.assertEqual({testobject.id}, set(self.store))
  131. self.assertIn(testobject.id, self.store)
  132. r = self.store[testobject.id]
  133. self.assertEqual(r, testobject)
  134. def test_add_objects(self) -> None:
  135. """Test adding multiple objects to store."""
  136. data = [(testobject, "mypath")]
  137. self.store.add_objects(data)
  138. self.assertEqual({testobject.id}, set(self.store))
  139. self.assertIn(testobject.id, self.store)
  140. r = self.store[testobject.id]
  141. self.assertEqual(r, testobject)
  142. def test_tree_changes(self) -> None:
  143. """Test detecting changes between trees."""
  144. blob_a1 = make_object(Blob, data=b"a1")
  145. blob_a2 = make_object(Blob, data=b"a2")
  146. blob_b = make_object(Blob, data=b"b")
  147. for blob in [blob_a1, blob_a2, blob_b]:
  148. self.store.add_object(blob)
  149. blobs_1 = [(b"a", blob_a1.id, 0o100644), (b"b", blob_b.id, 0o100644)]
  150. tree1_id = commit_tree(self.store, blobs_1)
  151. blobs_2 = [(b"a", blob_a2.id, 0o100644), (b"b", blob_b.id, 0o100644)]
  152. tree2_id = commit_tree(self.store, blobs_2)
  153. change_a = (
  154. (b"a", b"a"),
  155. (0o100644, 0o100644),
  156. (blob_a1.id, blob_a2.id),
  157. )
  158. self.assertEqual([change_a], list(self.store.tree_changes(tree1_id, tree2_id)))
  159. self.assertEqual(
  160. [
  161. change_a,
  162. ((b"b", b"b"), (0o100644, 0o100644), (blob_b.id, blob_b.id)),
  163. ],
  164. list(self.store.tree_changes(tree1_id, tree2_id, want_unchanged=True)),
  165. )
  166. def test_iter_tree_contents(self) -> None:
  167. """Test iterating over tree contents."""
  168. blob_a = make_object(Blob, data=b"a")
  169. blob_b = make_object(Blob, data=b"b")
  170. blob_c = make_object(Blob, data=b"c")
  171. for blob in [blob_a, blob_b, blob_c]:
  172. self.store.add_object(blob)
  173. blobs = [
  174. (b"a", blob_a.id, 0o100644),
  175. (b"ad/b", blob_b.id, 0o100644),
  176. (b"ad/bd/c", blob_c.id, 0o100755),
  177. (b"ad/c", blob_c.id, 0o100644),
  178. (b"c", blob_c.id, 0o100644),
  179. ]
  180. tree_id = commit_tree(self.store, blobs)
  181. self.assertEqual(
  182. [TreeEntry(p, m, h) for (p, h, m) in blobs],
  183. list(iter_tree_contents(self.store, tree_id)),
  184. )
  185. self.assertEqual([], list(iter_tree_contents(self.store, None)))
  186. def test_iter_tree_contents_include_trees(self) -> None:
  187. """Test iterating tree contents including tree objects."""
  188. blob_a = make_object(Blob, data=b"a")
  189. blob_b = make_object(Blob, data=b"b")
  190. blob_c = make_object(Blob, data=b"c")
  191. for blob in [blob_a, blob_b, blob_c]:
  192. self.store.add_object(blob)
  193. blobs = [
  194. (b"a", blob_a.id, 0o100644),
  195. (b"ad/b", blob_b.id, 0o100644),
  196. (b"ad/bd/c", blob_c.id, 0o100755),
  197. ]
  198. tree_id = commit_tree(self.store, blobs)
  199. tree = self.store[tree_id]
  200. assert isinstance(tree, Tree)
  201. tree_ad = self.store[tree[b"ad"][1]]
  202. assert isinstance(tree_ad, Tree)
  203. tree_bd = self.store[tree_ad[b"bd"][1]]
  204. expected = [
  205. TreeEntry(b"", 0o040000, tree_id),
  206. TreeEntry(b"a", 0o100644, blob_a.id),
  207. TreeEntry(b"ad", 0o040000, tree_ad.id),
  208. TreeEntry(b"ad/b", 0o100644, blob_b.id),
  209. TreeEntry(b"ad/bd", 0o040000, tree_bd.id),
  210. TreeEntry(b"ad/bd/c", 0o100755, blob_c.id),
  211. ]
  212. actual = iter_tree_contents(self.store, tree_id, include_trees=True)
  213. self.assertEqual(expected, list(actual))
  214. def make_tag(self, name: bytes, obj: ShaFile) -> Tag:
  215. """Helper to create and add a tag object."""
  216. tag = make_tag(obj, name=name)
  217. self.store.add_object(tag)
  218. return tag
  219. def test_peel_sha(self) -> None:
  220. """Test peeling SHA to get underlying object."""
  221. self.store.add_object(testobject)
  222. tag1 = self.make_tag(b"1", testobject)
  223. tag2 = self.make_tag(b"2", testobject)
  224. tag3 = self.make_tag(b"3", testobject)
  225. for obj in [testobject, tag1, tag2, tag3]:
  226. self.assertEqual((obj, testobject), peel_sha(self.store, obj.id))
  227. def test_get_raw(self) -> None:
  228. """Test getting raw object data."""
  229. self.store.add_object(testobject)
  230. self.assertEqual(
  231. (Blob.type_num, b"yummy data"), self.store.get_raw(testobject.id)
  232. )
  233. def test_close(self) -> None:
  234. """Test closing the object store."""
  235. # For now, just check that close doesn't barf.
  236. self.store.add_object(testobject)
  237. self.store.close()
  238. def test_iter_prefix(self) -> None:
  239. """Test iterating objects by prefix."""
  240. self.store.add_object(testobject)
  241. self.assertEqual([testobject.id], list(self.store.iter_prefix(testobject.id)))
  242. self.assertEqual(
  243. [testobject.id], list(self.store.iter_prefix(testobject.id[:10]))
  244. )
  245. def test_iterobjects_subset_all_present(self) -> None:
  246. """Test iterating over a subset of objects that all exist."""
  247. blob1 = make_object(Blob, data=b"blob 1 data")
  248. blob2 = make_object(Blob, data=b"blob 2 data")
  249. self.store.add_object(blob1)
  250. self.store.add_object(blob2)
  251. objects = list(self.store.iterobjects_subset([blob1.id, blob2.id]))
  252. self.assertEqual(2, len(objects))
  253. object_ids = set(o.id for o in objects)
  254. self.assertEqual(set([blob1.id, blob2.id]), object_ids)
  255. def test_iterobjects_subset_missing_not_allowed(self) -> None:
  256. """Test iterating with missing objects when not allowed."""
  257. blob1 = make_object(Blob, data=b"blob 1 data")
  258. self.store.add_object(blob1)
  259. missing_sha = ObjectID(b"1" * 40)
  260. self.assertRaises(
  261. KeyError,
  262. lambda: list(self.store.iterobjects_subset([blob1.id, missing_sha])),
  263. )
  264. def test_iterobjects_subset_missing_allowed(self) -> None:
  265. """Test iterating with missing objects when allowed."""
  266. blob1 = make_object(Blob, data=b"blob 1 data")
  267. self.store.add_object(blob1)
  268. missing_sha = ObjectID(b"1" * 40)
  269. objects = list(
  270. self.store.iterobjects_subset([blob1.id, missing_sha], allow_missing=True)
  271. )
  272. self.assertEqual(1, len(objects))
  273. self.assertEqual(blob1.id, objects[0].id)
  274. def test_iter_prefix_not_found(self) -> None:
  275. """Test iterating with prefix that doesn't match any objects."""
  276. self.assertEqual([], list(self.store.iter_prefix(b"1" * 40)))
  277. class PackBasedObjectStoreTests(ObjectStoreTests):
  278. """Tests for pack-based object stores."""
  279. store: PackBasedObjectStore
  280. def tearDown(self) -> None:
  281. """Clean up by closing all packs."""
  282. self.store.close()
  283. def test_empty_packs(self) -> None:
  284. """Test that new store has no packs."""
  285. self.assertEqual([], list(self.store.packs))
  286. def test_pack_loose_objects(self) -> None:
  287. """Test packing loose objects into packs."""
  288. b1 = make_object(Blob, data=b"yummy data")
  289. self.store.add_object(b1)
  290. b2 = make_object(Blob, data=b"more yummy data")
  291. self.store.add_object(b2)
  292. b3 = make_object(Blob, data=b"even more yummy data")
  293. b4 = make_object(Blob, data=b"and more yummy data")
  294. self.store.add_objects([(b3, None), (b4, None)])
  295. self.assertEqual({b1.id, b2.id, b3.id, b4.id}, set(self.store))
  296. self.assertEqual(1, len(self.store.packs))
  297. self.assertEqual(2, self.store.pack_loose_objects())
  298. self.assertNotEqual([], list(self.store.packs))
  299. self.assertEqual(0, self.store.pack_loose_objects())
  300. def test_repack(self) -> None:
  301. """Test repacking multiple packs into one."""
  302. b1 = make_object(Blob, data=b"yummy data")
  303. self.store.add_object(b1)
  304. b2 = make_object(Blob, data=b"more yummy data")
  305. self.store.add_object(b2)
  306. b3 = make_object(Blob, data=b"even more yummy data")
  307. b4 = make_object(Blob, data=b"and more yummy data")
  308. self.store.add_objects([(b3, None), (b4, None)])
  309. b5 = make_object(Blob, data=b"and more data")
  310. b6 = make_object(Blob, data=b"and some more data")
  311. self.store.add_objects([(b5, None), (b6, None)])
  312. self.assertEqual({b1.id, b2.id, b3.id, b4.id, b5.id, b6.id}, set(self.store))
  313. self.assertEqual(2, len(self.store.packs))
  314. self.assertEqual(6, self.store.repack())
  315. self.assertEqual(1, len(self.store.packs))
  316. self.assertEqual(0, self.store.pack_loose_objects())
  317. def test_repack_existing(self) -> None:
  318. """Test repacking with existing objects."""
  319. b1 = make_object(Blob, data=b"yummy data")
  320. self.store.add_object(b1)
  321. b2 = make_object(Blob, data=b"more yummy data")
  322. self.store.add_object(b2)
  323. self.store.add_objects([(b1, None), (b2, None)])
  324. self.store.add_objects([(b2, None)])
  325. self.assertEqual({b1.id, b2.id}, set(self.store))
  326. self.assertEqual(2, len(self.store.packs))
  327. self.assertEqual(2, self.store.repack())
  328. self.assertEqual(1, len(self.store.packs))
  329. self.assertEqual(0, self.store.pack_loose_objects())
  330. self.assertEqual({b1.id, b2.id}, set(self.store))
  331. self.assertEqual(1, len(self.store.packs))
  332. self.assertEqual(2, self.store.repack())
  333. self.assertEqual(1, len(self.store.packs))
  334. self.assertEqual(0, self.store.pack_loose_objects())
  335. def test_repack_with_exclude(self) -> None:
  336. """Test repacking while excluding specific objects."""
  337. b1 = make_object(Blob, data=b"yummy data")
  338. self.store.add_object(b1)
  339. b2 = make_object(Blob, data=b"more yummy data")
  340. self.store.add_object(b2)
  341. b3 = make_object(Blob, data=b"even more yummy data")
  342. b4 = make_object(Blob, data=b"and more yummy data")
  343. self.store.add_objects([(b3, None), (b4, None)])
  344. self.assertEqual({b1.id, b2.id, b3.id, b4.id}, set(self.store))
  345. self.assertEqual(1, len(self.store.packs))
  346. # Repack, excluding b2 and b3
  347. excluded = {b2.id, b3.id}
  348. self.assertEqual(2, self.store.repack(exclude=excluded))
  349. # Should have repacked only b1 and b4
  350. self.assertEqual(1, len(self.store.packs))
  351. self.assertIn(b1.id, self.store)
  352. self.assertNotIn(b2.id, self.store)
  353. self.assertNotIn(b3.id, self.store)
  354. self.assertIn(b4.id, self.store)
  355. def test_delete_loose_object(self) -> None:
  356. """Test deleting loose objects."""
  357. b1 = make_object(Blob, data=b"test data")
  358. self.store.add_object(b1)
  359. # Verify it's loose
  360. self.assertTrue(self.store.contains_loose(b1.id))
  361. self.assertIn(b1.id, self.store)
  362. # Delete it
  363. self.store.delete_loose_object(b1.id)
  364. # Verify it's gone
  365. self.assertFalse(self.store.contains_loose(b1.id))
  366. self.assertNotIn(b1.id, self.store)
  367. class CommitTestHelper:
  368. """Helper for tests which iterate over commits."""
  369. def setUp(self) -> None:
  370. """Set up test fixture."""
  371. super().setUp() # type: ignore[misc]
  372. self._store = MemoryObjectStore()
  373. def make_commit(self, **attrs: Any) -> Commit: # noqa: ANN401
  374. """Helper to create and store a commit."""
  375. commit = make_commit(**attrs)
  376. self._store.add_object(commit)
  377. return commit
  378. class IterCommitContentsTests(CommitTestHelper, TestCase):
  379. """Tests for iter_commit_contents."""
  380. def make_commits_with_contents(self) -> Commit:
  381. """Helper to prepare test commits."""
  382. files = [
  383. # (path, contents)
  384. (b"foo", b"foo"),
  385. (b"bar", b"bar"),
  386. (b"dir/baz", b"baz"),
  387. (b"dir/subdir/foo", b"subfoo"),
  388. (b"dir/subdir/bar", b"subbar"),
  389. (b"dir/subdir/baz", b"subbaz"),
  390. ]
  391. blobs = {contents: make_object(Blob, data=contents) for path, contents in files}
  392. for blob in blobs.values():
  393. self._store.add_object(blob)
  394. commit = self.make_commit(
  395. tree=commit_tree(
  396. self._store,
  397. [(path, blobs[contents].id, 0o100644) for path, contents in files],
  398. )
  399. )
  400. return commit
  401. def assertCommitEntries(
  402. self, results: Iterator[TreeEntry], expected: list[tuple[bytes, bytes]]
  403. ) -> None:
  404. """Assert that iter_commit_contents results are equal to expected."""
  405. actual = []
  406. for entry in results:
  407. assert entry.sha is not None
  408. obj = self._store[entry.sha]
  409. assert isinstance(obj, Blob)
  410. actual.append((entry.path, obj.data))
  411. self.assertEqual(actual, expected)
  412. def test_iter_commit_contents_no_includes(self) -> None:
  413. """Test iterating commit contents without includes."""
  414. commit = self.make_commits_with_contents()
  415. # this is the same list as used by make_commits_with_contents,
  416. # but ordered to match the actual iter_tree_contents iteration
  417. # order
  418. all_files = [
  419. (b"bar", b"bar"),
  420. (b"dir/baz", b"baz"),
  421. (b"dir/subdir/bar", b"subbar"),
  422. (b"dir/subdir/baz", b"subbaz"),
  423. (b"dir/subdir/foo", b"subfoo"),
  424. (b"foo", b"foo"),
  425. ]
  426. # No includes
  427. self.assertCommitEntries(iter_commit_contents(self._store, commit), all_files)
  428. # Explicit include=None
  429. self.assertCommitEntries(
  430. iter_commit_contents(self._store, commit, include=None), all_files
  431. )
  432. # include=[] is not the same as None
  433. self.assertCommitEntries(
  434. iter_commit_contents(self._store, commit, include=[]), []
  435. )
  436. def test_iter_commit_contents_with_includes(self) -> None:
  437. """Test iterating commit contents with includes."""
  438. commit = self.make_commits_with_contents()
  439. include1 = ["foo", "bar"]
  440. expected1 = [
  441. # Note: iter_tree_contents iterates in name order, but we
  442. # listed two separate paths, so they'll keep their order
  443. # as specified
  444. (b"foo", b"foo"),
  445. (b"bar", b"bar"),
  446. ]
  447. include2 = ["foo", "dir/subdir"]
  448. expected2 = [
  449. # foo
  450. (b"foo", b"foo"),
  451. # dir/subdir
  452. (b"dir/subdir/bar", b"subbar"),
  453. (b"dir/subdir/baz", b"subbaz"),
  454. (b"dir/subdir/foo", b"subfoo"),
  455. ]
  456. include3 = ["dir"]
  457. expected3 = [
  458. (b"dir/baz", b"baz"),
  459. (b"dir/subdir/bar", b"subbar"),
  460. (b"dir/subdir/baz", b"subbaz"),
  461. (b"dir/subdir/foo", b"subfoo"),
  462. ]
  463. for include, expected in [
  464. (include1, expected1),
  465. (include2, expected2),
  466. (include3, expected3),
  467. ]:
  468. self.assertCommitEntries(
  469. iter_commit_contents(self._store, commit, include=include), expected
  470. )
  471. def test_iter_commit_contents_overlapping_includes(self) -> None:
  472. """Test iterating commit contents with overlaps in includes."""
  473. commit = self.make_commits_with_contents()
  474. include1 = ["dir", "dir/baz"]
  475. expected1 = [
  476. # dir
  477. (b"dir/baz", b"baz"),
  478. (b"dir/subdir/bar", b"subbar"),
  479. (b"dir/subdir/baz", b"subbaz"),
  480. (b"dir/subdir/foo", b"subfoo"),
  481. # dir/baz
  482. (b"dir/baz", b"baz"),
  483. ]
  484. include2 = ["dir", "dir/subdir", "dir/subdir/baz"]
  485. expected2 = [
  486. # dir
  487. (b"dir/baz", b"baz"),
  488. (b"dir/subdir/bar", b"subbar"),
  489. (b"dir/subdir/baz", b"subbaz"),
  490. (b"dir/subdir/foo", b"subfoo"),
  491. # dir/subdir
  492. (b"dir/subdir/bar", b"subbar"),
  493. (b"dir/subdir/baz", b"subbaz"),
  494. (b"dir/subdir/foo", b"subfoo"),
  495. # dir/subdir/baz
  496. (b"dir/subdir/baz", b"subbaz"),
  497. ]
  498. for include, expected in [
  499. (include1, expected1),
  500. (include2, expected2),
  501. ]:
  502. self.assertCommitEntries(
  503. iter_commit_contents(self._store, commit, include=include), expected
  504. )
  505. class FindShallowTests(CommitTestHelper, TestCase):
  506. """Tests for finding shallow commits."""
  507. def make_linear_commits(self, n: int, message: bytes = b"") -> list[Commit]:
  508. """Create a linear chain of commits."""
  509. commits = []
  510. parents: list[bytes] = []
  511. for _ in range(n):
  512. commits.append(self.make_commit(parents=parents, message=message))
  513. parents = [commits[-1].id]
  514. return commits
  515. def assertSameElements(
  516. self, expected: Sequence[object], actual: Sequence[object]
  517. ) -> None:
  518. """Assert that two sequences contain the same elements."""
  519. self.assertEqual(set(expected), set(actual))
  520. def test_linear(self) -> None:
  521. """Test finding shallow commits in a linear history."""
  522. c1, c2, c3 = self.make_linear_commits(3)
  523. self.assertEqual((set([c3.id]), set([])), find_shallow(self._store, [c3.id], 1))
  524. self.assertEqual(
  525. (set([c2.id]), set([c3.id])),
  526. find_shallow(self._store, [c3.id], 2),
  527. )
  528. self.assertEqual(
  529. (set([c1.id]), set([c2.id, c3.id])),
  530. find_shallow(self._store, [c3.id], 3),
  531. )
  532. self.assertEqual(
  533. (set([]), set([c1.id, c2.id, c3.id])),
  534. find_shallow(self._store, [c3.id], 4),
  535. )
  536. def test_multiple_independent(self) -> None:
  537. """Test finding shallow commits with multiple independent branches."""
  538. a = self.make_linear_commits(2, message=b"a")
  539. b = self.make_linear_commits(2, message=b"b")
  540. c = self.make_linear_commits(2, message=b"c")
  541. heads = [a[1].id, b[1].id, c[1].id]
  542. self.assertEqual(
  543. (set([a[0].id, b[0].id, c[0].id]), set(heads)),
  544. find_shallow(self._store, heads, 2),
  545. )
  546. def test_multiple_overlapping(self) -> None:
  547. """Test finding shallow commits with overlapping branches."""
  548. # Create the following commit tree:
  549. # 1--2
  550. # \
  551. # 3--4
  552. c1, c2 = self.make_linear_commits(2)
  553. c3 = self.make_commit(parents=[c1.id])
  554. c4 = self.make_commit(parents=[c3.id])
  555. # 1 is shallow along the path from 4, but not along the path from 2.
  556. self.assertEqual(
  557. (set([c1.id]), set([c1.id, c2.id, c3.id, c4.id])),
  558. find_shallow(self._store, [c2.id, c4.id], 3),
  559. )
  560. def test_merge(self) -> None:
  561. """Test finding shallow commits with merge commits."""
  562. c1 = self.make_commit()
  563. c2 = self.make_commit()
  564. c3 = self.make_commit(parents=[c1.id, c2.id])
  565. self.assertEqual(
  566. (set([c1.id, c2.id]), set([c3.id])),
  567. find_shallow(self._store, [c3.id], 2),
  568. )
  569. def test_tag(self) -> None:
  570. """Test finding shallow commits with tags."""
  571. c1, c2 = self.make_linear_commits(2)
  572. tag = make_tag(c2, name=b"tag")
  573. self._store.add_object(tag)
  574. self.assertEqual(
  575. (set([c1.id]), set([c2.id])),
  576. find_shallow(self._store, [tag.id], 2),
  577. )