project-spec 0.9.2 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,165 +0,0 @@
1
- import json
2
- import os
3
- import shutil
4
- from pathlib import Path
5
- import subprocess
6
- import tempfile
7
- import unittest
8
-
9
- SCRIPT = Path(__file__).with_name('merge.py')
10
-
11
-
12
- class MergeTests(unittest.TestCase):
13
- def setUp(self):
14
- self.tmp = tempfile.TemporaryDirectory()
15
- self.addCleanup(self.tmp.cleanup)
16
- self.repo = Path(self.tmp.name)
17
- self.git('init', '-b', 'main')
18
- self.git('config', 'user.email', 'test@example.invalid')
19
- self.git('config', 'user.name', 'Test')
20
- self.vault = self.repo / 'vault'
21
- (self.vault / '.knowledge').mkdir(parents=True)
22
- self.note('old.md', 'old', 'base')
23
- self.note('shared.md', 'shared', 'base')
24
- (self.vault / '.knowledge/review.json').write_text('base')
25
- self.commit('base')
26
- self.base = self.git('rev-parse', 'HEAD').strip()
27
- self.git('checkout', '-b', 'ours')
28
-
29
- def git(self, *args):
30
- return subprocess.run(['git', '-C', str(self.repo), *args], capture_output=True, text=True, check=True).stdout
31
-
32
- def note(self, name, ident, body=''):
33
- path = self.vault / name
34
- path.parent.mkdir(parents=True, exist_ok=True)
35
- path.write_text('---\nid: ' + json.dumps(ident) + '\n---\n' + body + '\n')
36
-
37
- def commit(self, msg):
38
- self.git('add', '-A')
39
- self.git('commit', '-m', msg)
40
-
41
- def call(self, ours='ours', theirs='theirs', repo=None, vault=None):
42
- return subprocess.run(['python3', str(SCRIPT), 'inspect', '--repo', str(repo or self.repo), '--vault', str(vault or self.vault), '--ours', ours, '--theirs', theirs, '--json'], capture_output=True, text=True)
43
-
44
- def test_overlap_rename_delete_duplicate_and_states_without_mutation(self):
45
- self.git('mv', 'vault/old.md', 'vault/renamed.md')
46
- self.note('shared.md', 'shared', 'ours')
47
- self.note('a.md', 'same-id', 'ours')
48
- self.note('both.md', 'ours-id', 'ours')
49
- (self.vault / '.knowledge/review.json').write_text('ours')
50
- self.commit('ours')
51
- self.git('checkout', '-b', 'theirs', self.base)
52
- self.git('rm', 'vault/old.md')
53
- self.note('shared.md', 'shared', 'theirs')
54
- self.note('b.md', 'same-id', 'theirs')
55
- self.note('both.md', 'theirs-id', 'theirs')
56
- (self.vault / '.knowledge/review.json').write_text('theirs')
57
- (self.vault / '.knowledge/sources.json').write_text('{}')
58
- self.commit('theirs')
59
- before = self.git('status', '--porcelain=v1')
60
- index = (self.repo / '.git/index').read_bytes()
61
- result = self.call()
62
- self.assertEqual(result.returncode, 0, result.stderr)
63
- report = json.loads(result.stdout)
64
- self.assertEqual(report['base'], self.base)
65
- self.assertTrue(report['needs_review'])
66
- self.assertEqual(report['shared_canonical_paths'], ['vault/both.md', 'vault/old.md', 'vault/shared.md'])
67
- self.assertEqual(report['duplicate_ids'], [{'id': 'same-id', 'ours': ['vault/a.md'], 'theirs': ['vault/b.md']}])
68
- self.assertTrue(any(x['status'].startswith('R') for x in report['changes']['ours']))
69
- self.assertTrue(any(x['status'] == 'D' for x in report['changes']['theirs']))
70
- self.assertTrue(report['reviewed_state']['.knowledge/review.json']['different'])
71
- self.assertIsNotNone(report['reviewed_state']['.knowledge/review.json']['base'])
72
- self.assertIsNone(report['reviewed_state']['.knowledge/sources.json']['base'])
73
- self.assertEqual(before, self.git('status', '--porcelain=v1'))
74
- self.assertEqual(index, (self.repo / '.git/index').read_bytes())
75
-
76
- def test_disjoint_changes(self):
77
- self.note('left.md', 'left'); self.commit('left')
78
- self.git('checkout', '-b', 'theirs', self.base)
79
- self.note('right.md', 'right'); self.commit('right')
80
- result = self.call()
81
- self.assertEqual(result.returncode, 0, result.stderr)
82
- report = json.loads(result.stdout)
83
- self.assertFalse(report['needs_review'])
84
- self.assertEqual(report['shared_canonical_paths'], [])
85
-
86
- def test_missing_and_unrelated_refs_and_shallow(self):
87
- self.note('x.md', 'x'); self.commit('ours')
88
- self.assertEqual(self.call(theirs='missing').returncode, 1)
89
- self.git('checkout', '--orphan', 'theirs')
90
- self.git('rm', '-rf', '.')
91
- self.vault.mkdir(exist_ok=True)
92
- self.note('y.md', 'y'); self.commit('unrelated')
93
- result = self.call()
94
- self.assertEqual(result.returncode, 1)
95
- self.assertIn('no common merge base', result.stderr)
96
- clone = self.repo.parent / (self.repo.name + '-shallow')
97
- self.addCleanup(lambda: __import__('shutil').rmtree(clone, ignore_errors=True))
98
- subprocess.run(['git', 'clone', '--depth=1', '-q', self.repo.as_uri(), str(clone)], check=True)
99
- result = self.call(ours='HEAD', theirs='HEAD', repo=clone, vault=clone / 'vault')
100
- self.assertEqual(result.returncode, 1)
101
- self.assertIn('shallow history', result.stderr)
102
-
103
- def test_ambiguous_ref_and_multiple_merge_bases(self):
104
- self.note('x.md', 'x'); self.commit('ours')
105
- self.git('tag', 'ours', self.base)
106
- self.assertIn('ambiguous ref', self.call(ours='ours', theirs='HEAD').stderr)
107
- self.git('tag', '-d', 'ours')
108
- first = self.git('rev-parse', 'HEAD').strip()
109
- self.git('checkout', '-b', 'theirs', self.base)
110
- self.note('y.md', 'y'); self.commit('theirs')
111
- second = self.git('rev-parse', 'HEAD').strip()
112
- tree = self.git('rev-parse', 'HEAD^{tree}').strip()
113
- one = self.git('commit-tree', tree, '-p', first, '-p', second, '-m', 'merge one').strip()
114
- two = self.git('commit-tree', tree, '-p', second, '-p', first, '-m', 'merge two').strip()
115
- result = self.call(ours=one, theirs=two)
116
- self.assertEqual(result.returncode, 1)
117
- self.assertIn('multiple merge bases', result.stderr)
118
-
119
- def test_fresh_invocation_does_not_write_fixture_or_skill(self):
120
- self.note('left.md', 'left'); self.commit('left')
121
- self.git('checkout', '-b', 'theirs', self.base)
122
- self.note('right.md', 'right'); self.commit('right')
123
- with tempfile.TemporaryDirectory() as directory:
124
- copied = Path(directory) / 'scripts'
125
- copied.mkdir()
126
- for name in ('merge.py', 'knowledge.py'):
127
- shutil.copy2(SCRIPT.parent / name, copied / name)
128
- def inventory(root):
129
- return {str(p.relative_to(root)): ('dir' if p.is_dir() else p.read_bytes())
130
- for p in root.rglob('*') if not p.is_symlink()}
131
- before_repo, before_skill = inventory(self.repo), inventory(copied)
132
- env = dict(os.environ)
133
- env.pop('PYTHONDONTWRITEBYTECODE', None)
134
- result = subprocess.run(['python3', str(copied / 'merge.py'), 'inspect', '--repo', str(self.repo), '--vault', str(self.vault), '--ours', 'ours', '--theirs', 'theirs', '--json'], env=env, capture_output=True, text=True)
135
- self.assertEqual(result.returncode, 0, result.stderr)
136
- self.assertEqual(before_repo, inventory(self.repo))
137
- self.assertEqual(before_skill, inventory(copied))
138
-
139
- def test_partial_and_promisor_config_rejected_before_object_access(self):
140
- self.note('x.md', 'x'); self.commit('ours')
141
- for key, value in (('extensions.partialClone', 'origin'), ('remote.origin.promisor', 'true')):
142
- with self.subTest(key=key):
143
- self.git('config', key, value)
144
- result = self.call(ours='does-not-exist', theirs='HEAD')
145
- self.assertEqual(result.returncode, 1)
146
- self.assertIn('requires full local history', result.stderr)
147
- self.assertNotIn(value, result.stderr)
148
- self.git('config', '--unset', key)
149
-
150
- def test_symlink_blob_not_parsed_and_credential_paths_ignored(self):
151
- (self.vault / 'alias.md').symlink_to('old.md')
152
- (self.vault / '.env.md').write_text('---\nid: "secret"\n---\n')
153
- self.commit('unsafe')
154
- self.git('checkout', '-b', 'theirs', self.base)
155
- self.note('other.md', 'other'); self.commit('other')
156
- result = self.call()
157
- self.assertEqual(result.returncode, 0, result.stderr)
158
- report = json.loads(result.stdout)
159
- self.assertEqual(report['skipped_id_paths']['ours'][0]['reason'], 'not a regular file blob')
160
- self.assertNotIn('.env.md', result.stdout)
161
- self.assertTrue(report['needs_review'])
162
-
163
-
164
- if __name__ == '__main__':
165
- unittest.main()