def test_changeset(self):
commit = FakeGitCommit()
commit.author = 'Foo Bar <foo@bar> 1482880019 +0200'
commit.committer = commit.author
commit.body = 'Some commit'
changeset = Changeset.from_git_commit(commit)
self.assertEqual(changeset.author, 'Foo Bar <foo@bar>')
self.assertEqual(changeset.timestamp, '1482880019')
self.assertEqual(changeset.utcoffset, '-7200')
self.assertEqual(changeset.body, 'Some commit')
self.assertEqual(changeset.extra, None)
self.assertEqual(changeset.manifest, NULL_NODE_ID)
self.assertEqual(changeset.files, [])
commit.committer = 'Bar Baz <bar@baz> 1482988370 -0500'
changeset = Changeset.from_git_commit(commit)
self.assertEqual(changeset.author, 'Foo Bar <foo@bar>')
self.assertEqual(changeset.timestamp, '1482880019')
self.assertEqual(changeset.utcoffset, '-7200')
self.assertEqual(changeset.body, 'Some commit')
self.assertEqual(changeset.extra, {
'committer': 'Bar Baz <bar@baz> 1482988370 18000',
})
self.assertEqual(changeset.manifest, NULL_NODE_ID)
self.assertEqual(changeset.files, [])
def create_hg_metadata(self, commit, parents):
if check_enabled('bundle'):
real_changeset = self.changeset(self.hg_changeset(commit))
manifest, changeset_files = self.create_hg_manifest(commit, parents)
commit_data = GitCommit(commit)
if manifest.node == NULL_NODE_ID:
manifest.node = manifest.sha1
if check_enabled('bundle'):
if real_changeset and (manifest.node !=
real_changeset.manifest):
for path, created, real in sorted_merge(
manifest,
self.manifest(real_changeset.manifest),
key=lambda i: i.path,
non_key=lambda i: i):
if bytes(created) != bytes(real):
logging.error('%r != %r', bytes(created),
bytes(real))
self._pushed.add(manifest.node)
self.store_manifest(manifest)
self._manifest_git_tree[manifest.node] = commit_data.tree
changeset = Changeset.from_git_commit(commit_data)
changeset.parents = tuple(self.hg_changeset(p) for p in parents)
changeset.manifest = manifest.node
changeset.files = changeset_files
if parents:
parent_changeset = self.changeset(changeset.parent1)
if parent_changeset.branch:
changeset.branch = parent_changeset.branch
if self._graft is True and parents and changeset.body[-1:] == b'\n':
parent_commit = GitCommit(parents[0])
if (parent_commit.body[-1:] == b'\n'
and parent_commit.body[-2] == parent_changeset.body[-1]):
self._graft = 'true'
if self._graft == 'true' and changeset.body[-1:] == b'\n':
changeset.body = changeset.body[:-1]
changeset.node = changeset.sha1
self._pushed.add(changeset.node)
self.store_changeset(changeset, commit_data)
if check_enabled('bundle') and real_changeset:
error = False
for k in ('files', 'manifest'):
if getattr(real_changeset, k, []) != getattr(changeset, k, []):
logging.error('(%s) %r != %r', k,
getattr(real_changeset, k, None),
getattr(changeset, k, None))
error = True
if error:
raise Exception('Changeset mismatch')
def create_hg_metadata(self, commit, parents):
if check_enabled('bundle'):
real_changeset = self.changeset(self.hg_changeset(commit))
manifest, changeset_files = self.create_hg_manifest(commit, parents)
commit_data = GitCommit(commit)
if manifest.node == NULL_NODE_ID:
manifest.node = manifest.sha1
if check_enabled('bundle'):
if real_changeset and (
manifest.node != real_changeset.manifest):
for path, created, real in sorted_merge(
manifest._lines,
self.manifest(real_changeset.manifest)._lines,
key=lambda i: i.name, non_key=lambda i: i):
if str(created) != str(real):
logging.error('%r != %r', str(created), str(real))
self._pushed.add(manifest.node)
self.store_manifest(manifest)
self._manifest_git_tree[manifest.node] = commit_data.tree
changeset = Changeset.from_git_commit(commit_data)
changeset.parents = tuple(self.hg_changeset(p) for p in parents)
changeset.manifest = manifest.node
changeset.files = changeset_files
if parents:
parent_changeset = self.changeset(changeset.parent1)
if parent_changeset.branch:
changeset.branch = parent_changeset.branch
if self._graft is True and parents and changeset.body[-1] == '\n':
parent_commit = GitCommit(parents[0])
if (parent_commit.body[-1] == '\n' and
parent_commit.body[-2] == parent_changeset.body[-1]):
self._graft = 'true'
if self._graft == 'true' and changeset.body[-1] == '\n':
changeset.body = changeset.body[:-1]
changeset.node = changeset.sha1
self._pushed.add(changeset.node)
self.store_changeset(changeset, commit_data)
if check_enabled('bundle') and real_changeset:
error = False
for k in ('files', 'manifest'):
if getattr(real_changeset, k, []) != getattr(changeset, k, []):
logging.error('(%s) %r != %r', k,
getattr(real_changeset, k, None),
getattr(changeset, k, None))
error = True
if error:
raise Exception('Changeset mismatch')
def test_changeset_conflict(self):
changeset = Changeset()
changeset.author = 'Foo Bar <foo@bar>'
changeset.timestamp = '1482880019'
changeset.utcoffset = '-7200'
changeset.body = 'Some commit'
patcher = ChangesetPatcher(
'changeset 819432449785de2ce91b6afffec95a3cdee8c58b\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
)
changeset2 = patcher.apply(changeset)
self.assertEqual(changeset2.sha1, changeset2.node)
patcher = ChangesetPatcher(
'changeset 44d7916212a640292755f2a135e3cf90f355a1ff\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'extra branch:foo\n'
)
changeset2 = patcher.apply(changeset)
self.assertEqual(changeset2.sha1, changeset2.node)
changeset.body += '\0'
changeset2 = patcher.apply(changeset)
self.assertEqual(changeset2.sha1, changeset2.node)
def fsck(args):
'''check cinnabar metadata consistency'''
if not args.commit and not args.full:
return fsck_quick(args.force)
status = FsckStatus()
store = GitHgStore()
if args.full and args.commit:
logging.error('Cannot pass both --full and a commit')
return 1
if args.commit:
commits = set()
all_git_commits = {}
for c in args.commit:
cs = store.hg_changeset(c)
if cs:
commits.add(c)
c = cs.node
commit = GitHgHelper.hg2git(c)
if commit == NULL_NODE_ID and not cs:
status.info('Unknown commit or changeset: %s' % c)
return 1
if not cs:
cs = store.hg_changeset(commit)
commits.add(commit)
all_git_commits = GitHgHelper.rev_list('--no-walk=unsorted', *commits)
else:
all_refs = dict(
(ref, sha1) for sha1, ref in Git.for_each_ref('refs/cinnabar'))
if 'refs/cinnabar/metadata' in all_refs:
git_heads = '%s^^@' % all_refs['refs/cinnabar/metadata']
else:
assert False
all_git_commits = GitHgHelper.rev_list('--topo-order',
'--full-history', '--reverse',
git_heads)
dag = gitdag()
GitHgHelper.reset_heads('manifests')
full_file_check = FileFindParents.logger.isEnabledFor(logging.DEBUG)
for node, tree, parents in progress_iter('Checking {} changesets',
all_git_commits):
node = store._replace.get(node, node)
hg_node = store.hg_changeset(node)
if not hg_node:
status.report('Missing note for git commit: ' + node)
continue
GitHgHelper.seen('git2hg', node)
changeset_data = store.changeset(hg_node)
changeset = changeset_data.node
GitHgHelper.seen('hg2git', changeset)
changeset_ref = store.changeset_ref(changeset)
if not changeset_ref:
status.report('Missing changeset in hg2git branch: %s' % changeset)
continue
elif str(changeset_ref) != node:
status.report('Commit mismatch for changeset %s\n'
' hg2git: %s\n commit: %s' %
(changeset, changeset_ref, node))
hg_changeset = store.changeset(changeset, include_parents=True)
if hg_changeset.node != hg_changeset.sha1:
status.report('Sha1 mismatch for changeset %s' % changeset)
dag.add(hg_changeset.node,
(hg_changeset.parent1, hg_changeset.parent2),
changeset_data.branch or 'default')
raw_changeset = Changeset.from_git_commit(node)
patcher = ChangesetPatcher.from_diff(raw_changeset, changeset_data)
if patcher != store.read_changeset_data(node):
status.fix('Adjusted changeset metadata for %s' % changeset)
GitHgHelper.set('changeset', changeset, NULL_NODE_ID)
GitHgHelper.set('changeset', changeset, node)
GitHgHelper.put_blob(patcher, want_sha1=False)
GitHgHelper.set('changeset-metadata', changeset, NULL_NODE_ID)
GitHgHelper.set('changeset-metadata', changeset, ':1')
manifest = changeset_data.manifest
if GitHgHelper.seen('hg2git', manifest) or manifest == NULL_NODE_ID:
continue
manifest_ref = store.manifest_ref(manifest)
if not manifest_ref:
status.report('Missing manifest in hg2git branch: %s' % manifest)
parents = tuple(
store.changeset(p).manifest for p in hg_changeset.parents)
git_parents = tuple(
store.manifest_ref(p) for p in parents if p != NULL_NODE_ID)
# This doesn't change the value but makes the helper track the manifest
# dag.
GitHgHelper.set('manifest', manifest, manifest_ref)
if not GitHgHelper.check_manifest(manifest):
status.report('Sha1 mismatch for manifest %s' % manifest)
manifest_commit_parents = GitCommit(manifest_ref).parents
if sorted(manifest_commit_parents) != sorted(git_parents):
# TODO: better error
status.report(
'%s(%s) %s != %s' %
(manifest, manifest_ref, manifest_commit_parents, git_parents))
# TODO: check that manifest content matches changeset content
changes = get_changes(manifest_ref, git_parents)
for path, hg_file, hg_fileparents in changes:
if hg_file != NULL_NODE_ID and (hg_file == HG_EMPTY_FILE
or GitHgHelper.seen(
'hg2git', hg_file)):
if full_file_check:
file = store.file(hg_file, hg_fileparents, git_parents,
store.manifest_path(path))
valid = file.node == file.sha1
else:
valid = GitHgHelper.check_file(hg_file, *hg_fileparents)
if not valid:
status.report('Sha1 mismatch for file %s in manifest %s' %
(hg_file, manifest_ref))
if not args.commit and not status('broken'):
store_manifest_heads = set(store._manifest_heads_orig)
manifest_heads = set(GitHgHelper.heads('manifests'))
if store_manifest_heads != manifest_heads:
def iter_manifests(a, b):
for h in a - b:
yield h
for h in b:
yield '^%s' % h
for m, t, p in GitHgHelper.rev_list(
'--topo-order', '--full-history', '--reverse',
*iter_manifests(manifest_heads, store_manifest_heads)):
status.fix('Missing manifest commit in manifest branch: %s' %
m)
for m, t, p in GitHgHelper.rev_list(
'--topo-order', '--full-history', '--reverse',
*iter_manifests(store_manifest_heads, manifest_heads)):
status.fix('Removing metadata commit %s with no corresponding '
'changeset' % (m))
for h in store_manifest_heads - manifest_heads:
if GitHgHelper.seen('hg2git', store.hg_manifest(h)):
status.fix('Removing non-head reference to %s in manifests'
' metadata.' % h)
dangling = ()
if not args.commit and not status('broken'):
dangling = GitHgHelper.dangling('hg2git')
for obj in dangling:
status.fix('Removing dangling metadata for ' + obj)
# Theoretically, we should figure out if they are files, manifests
# or changesets and set the right variable accordingly, but in
# practice, it makes no difference. Reevaluate when GitHgStore.close
# is modified, though.
GitHgHelper.set('file', obj, NULL_NODE_ID)
GitHgHelper.set('file-meta', obj, NULL_NODE_ID)
if not args.commit and not status('broken'):
dangling = GitHgHelper.dangling('git2hg')
for c in dangling:
status.fix('Removing dangling note for commit ' + c)
GitHgHelper.set('changeset-metadata', c, NULL_NODE_ID)
if status('broken'):
status.info(
'Your git-cinnabar repository appears to be corrupted. There\n'
'are known issues in older revisions that have been fixed.\n'
'Please try running the following command to reset:\n'
' git cinnabar reclone\n\n'
'Please note this command may change the commit sha1s. Your\n'
'local branches will however stay untouched.\n'
'Please report any corruption that fsck would detect after a\n'
'reclone.')
if not args.commit:
status.info('Checking head references...')
computed_heads = defaultdict(set)
for branch, head in dag.all_heads():
computed_heads[branch].add(head)
for branch in sorted(dag.tags()):
stored_heads = store.heads({branch})
for head in computed_heads[branch] - stored_heads:
status.fix('Adding missing head %s in branch %s' %
(head, branch))
store.add_head(head)
for head in stored_heads - computed_heads[branch]:
status.fix('Removing non-head reference to %s in branch %s' %
(head, branch))
del store._hgheads[head]
metadata_commit = Git.resolve_ref('refs/cinnabar/metadata')
if status('broken'):
Git.update_ref('refs/cinnabar/broken', metadata_commit)
return 1
if args.full:
Git.update_ref('refs/cinnabar/checked', metadata_commit)
interval_expired('fsck', 0)
store.close()
if status('fixed'):
return 2
return 0
def test_changeset_patcher(self):
changeset = Changeset()
changeset.author = 'Foo Bar <foo@bar>'
changeset.timestamp = '1482880019'
changeset.utcoffset = '-7200'
changeset.body = 'Some commit'
self.assertEqual(changeset.extra, None)
self.assertEqual(changeset.manifest, NULL_NODE_ID)
self.assertEqual(changeset.files, [])
changeset2 = ChangesetPatcher().apply(changeset)
self.compare(changeset, changeset2)
self.assertEqual(ChangesetPatcher.from_diff(changeset, changeset2), '')
changeset2.manifest = 'b80de5d138758541c5f05265ad144ab9fa86d1db'
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 819432449785de2ce91b6afffec95a3cdee8c58b\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db'
)
self.compare(patcher.apply(changeset), changeset2)
changeset2.author = 'Foo Bar <foo@bar> and Bar Baz <bar@baz>'
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset bb75162aa9dd2401403fce07fab70ecb744c9c81\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'author Foo Bar <foo@bar> and Bar Baz <bar@baz>'
)
self.compare(patcher.apply(changeset), changeset2)
changeset2.extra = ''
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 1aa91b0daf86ebb0876c804bbb895e47d4de0923\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'author Foo Bar <foo@bar> and Bar Baz <bar@baz>\n'
'extra '
)
self.compare(patcher.apply(changeset), changeset2)
changeset2.extra = {
'committer': 'Bar Baz <bar@baz> 1482880019 -7200',
}
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 12c357c434ed7d5770f8d2fa869c02510a450bd1\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'author Foo Bar <foo@bar> and Bar Baz <bar@baz>\n'
'extra committer:Bar Baz <bar@baz> 1482880019 -7200'
)
self.compare(patcher.apply(changeset), changeset2)
changeset2.files = [
'bar',
'foo',
]
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 9c0d9cb8a2c18ac3e73a1cd861c5013ac731de77\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'author Foo Bar <foo@bar> and Bar Baz <bar@baz>\n'
'extra committer:Bar Baz <bar@baz> 1482880019 -7200\n'
'files bar\x00foo'
)
self.compare(patcher.apply(changeset), changeset2)
changeset2.utcoffset = '-7201'
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 4db77e6e5dc0b61dc42fc0ce0d17130f96457914\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'author Foo Bar <foo@bar> and Bar Baz <bar@baz>\n'
'extra committer:Bar Baz <bar@baz> 1482880019 -7200\n'
'files bar\x00foo\n'
'patch 96,97,1'
)
self.compare(patcher.apply(changeset), changeset2)
changeset2.body += '\n'
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 2a50ebd0f4b26428413d4309b950939616c5bfca\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'author Foo Bar <foo@bar> and Bar Baz <bar@baz>\n'
'extra committer:Bar Baz <bar@baz> 1482880019 -7200\n'
'files bar\x00foo\n'
'patch 96,97,1\x00163,163,%0A'
)
self.compare(patcher.apply(changeset), changeset2)
changeset2.extra['amend_source'] = \
'2a50ebd0f4b26428413d4309b950939616c5bfca'
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 3ae3ee64c97d3f35fa057d1957c6ed3d5c053a3e\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'author Foo Bar <foo@bar> and Bar Baz <bar@baz>\n'
'extra amend_source:2a50ebd0f4b26428413d4309b950939616c5bfca\x00'
'committer:Bar Baz <bar@baz> 1482880019 -7200\n'
'files bar\x00foo\n'
'patch 96,97,1\x00217,217,%0A'
)
self.compare(patcher.apply(changeset), changeset2)
changeset2.author = changeset.author
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 14d43b6cb9272f6dad335ebd7fb8b5e3d77d910f\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'extra amend_source:2a50ebd0f4b26428413d4309b950939616c5bfca\x00'
'committer:Bar Baz <bar@baz> 1482880019 -7200\n'
'files bar\x00foo\n'
'patch 74,75,1\x00195,195,%0A'
)
self.compare(patcher.apply(changeset), changeset2)
changeset2.files = []
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 9fa49f5cfbaae8b2f1b6e4d3a483a2b2c1a3fed1\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'extra amend_source:2a50ebd0f4b26428413d4309b950939616c5bfca\x00'
'committer:Bar Baz <bar@baz> 1482880019 -7200\n'
'patch 74,75,1\x00187,187,%0A'
)
self.compare(patcher.apply(changeset), changeset2)
changeset.extra = {
'committer': 'Bar Baz <bar@baz> 1482880019 -7200',
}
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 9fa49f5cfbaae8b2f1b6e4d3a483a2b2c1a3fed1\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'extra amend_source:2a50ebd0f4b26428413d4309b950939616c5bfca\n'
'patch 74,75,1\x00187,187,%0A'
)
self.compare(patcher.apply(changeset), changeset2)
changeset.extra = {
'committer': 'Bar Baz <bar@baz> 1482988370 18000',
}
changeset2.node = changeset2.sha1
patcher = ChangesetPatcher.from_diff(changeset, changeset2)
self.assertEqual(
patcher,
'changeset 9fa49f5cfbaae8b2f1b6e4d3a483a2b2c1a3fed1\n'
'manifest b80de5d138758541c5f05265ad144ab9fa86d1db\n'
'extra amend_source:2a50ebd0f4b26428413d4309b950939616c5bfca\x00'
'committer:Bar Baz <bar@baz> 1482880019 -7200\n'
'patch 74,75,1\x00187,187,%0A'
)
self.compare(patcher.apply(changeset), changeset2)
def fsck(args):
'''check cinnabar metadata consistency'''
if not args.commit and not args.full:
return fsck_quick()
status = FsckStatus()
store = GitHgStore()
if args.full and args.commit:
logging.error('Cannot pass both --full and a commit')
return 1
if args.commit:
commits = set()
all_git_commits = {}
for c in args.commit:
cs = store.hg_changeset(c)
if cs:
commits.add(c)
c = cs.node
commit = GitHgHelper.hg2git(c)
if commit == NULL_NODE_ID and not cs:
status.info('Unknown commit or changeset: %s' % c)
return 1
if not cs:
cs = store.hg_changeset(commit)
commits.add(commit)
all_git_commits = GitHgHelper.rev_list('--no-walk=unsorted', *commits)
else:
all_refs = dict((ref, sha1)
for sha1, ref in Git.for_each_ref('refs/cinnabar'))
if 'refs/cinnabar/metadata' in all_refs:
git_heads = '%s^^@' % all_refs['refs/cinnabar/metadata']
else:
assert False
all_git_commits = GitHgHelper.rev_list(
'--topo-order', '--full-history', '--reverse', git_heads)
dag = gitdag()
GitHgHelper.reset_heads('manifests')
full_file_check = FileFindParents.logger.isEnabledFor(logging.DEBUG)
for node, tree, parents in progress_iter('Checking {} changesets',
all_git_commits):
node = store._replace.get(node, node)
hg_node = store.hg_changeset(node)
if not hg_node:
status.report('Missing note for git commit: ' + node)
continue
GitHgHelper.seen('git2hg', node)
changeset_data = store.changeset(hg_node)
changeset = changeset_data.node
GitHgHelper.seen('hg2git', changeset)
changeset_ref = store.changeset_ref(changeset)
if not changeset_ref:
status.report('Missing changeset in hg2git branch: %s' % changeset)
continue
elif str(changeset_ref) != node:
status.report('Commit mismatch for changeset %s\n'
' hg2git: %s\n commit: %s'
% (changeset, changeset_ref, node))
hg_changeset = store.changeset(changeset, include_parents=True)
if hg_changeset.node != hg_changeset.sha1:
status.report('Sha1 mismatch for changeset %s' % changeset)
dag.add(hg_changeset.node,
(hg_changeset.parent1, hg_changeset.parent2),
changeset_data.branch or 'default')
raw_changeset = Changeset.from_git_commit(node)
patcher = ChangesetPatcher.from_diff(raw_changeset, changeset_data)
if patcher != store.read_changeset_data(node):
status.fix('Adjusted changeset metadata for %s' % changeset)
GitHgHelper.set('changeset', changeset, NULL_NODE_ID)
GitHgHelper.set('changeset', changeset, node)
GitHgHelper.put_blob(patcher, want_sha1=False)
GitHgHelper.set('changeset-metadata', changeset, NULL_NODE_ID)
GitHgHelper.set('changeset-metadata', changeset, ':1')
manifest = changeset_data.manifest
if GitHgHelper.seen('hg2git', manifest) or manifest == NULL_NODE_ID:
continue
manifest_ref = store.manifest_ref(manifest)
if not manifest_ref:
status.report('Missing manifest in hg2git branch: %s' % manifest)
parents = tuple(
store.changeset(p).manifest
for p in hg_changeset.parents
)
git_parents = tuple(store.manifest_ref(p) for p in parents
if p != NULL_NODE_ID)
# This doesn't change the value but makes the helper track the manifest
# dag.
GitHgHelper.set('manifest', manifest, manifest_ref)
if not GitHgHelper.check_manifest(manifest):
status.report('Sha1 mismatch for manifest %s' % manifest)
manifest_commit_parents = GitCommit(manifest_ref).parents
if sorted(manifest_commit_parents) != sorted(git_parents):
# TODO: better error
status.report('%s(%s) %s != %s' % (manifest, manifest_ref,
manifest_commit_parents,
git_parents))
# TODO: check that manifest content matches changeset content
changes = get_changes(manifest_ref, git_parents)
for path, hg_file, hg_fileparents in changes:
if hg_file != NULL_NODE_ID and (hg_file == HG_EMPTY_FILE or
GitHgHelper.seen('hg2git',
hg_file)):
if full_file_check:
file = store.file(hg_file, hg_fileparents, git_parents,
store.manifest_path(path))
valid = file.node == file.sha1
else:
valid = GitHgHelper.check_file(hg_file,
*hg_fileparents)
if not valid:
status.report(
'Sha1 mismatch for file %s in manifest %s'
% (hg_file, manifest_ref))
if not args.commit and not status('broken'):
store_manifest_heads = set(store._manifest_heads_orig)
manifest_heads = set(GitHgHelper.heads('manifests'))
if store_manifest_heads != manifest_heads:
def iter_manifests(a, b):
for h in a - b:
yield h
for h in b:
yield '^%s' % h
for m, t, p in GitHgHelper.rev_list(
'--topo-order', '--full-history', '--reverse',
*iter_manifests(manifest_heads, store_manifest_heads)):
status.fix('Missing manifest commit in manifest branch: %s'
% m)
for m, t, p in GitHgHelper.rev_list(
'--topo-order', '--full-history', '--reverse',
*iter_manifests(store_manifest_heads, manifest_heads)):
status.fix('Removing metadata commit %s with no corresponding '
'changeset' % (m))
for h in store_manifest_heads - manifest_heads:
if GitHgHelper.seen('hg2git', store.hg_manifest(h)):
status.fix('Removing non-head reference to %s in manifests'
' metadata.' % h)
dangling = ()
if not args.commit and not status('broken'):
dangling = GitHgHelper.dangling('hg2git')
for obj in dangling:
status.fix('Removing dangling metadata for ' + obj)
# Theoretically, we should figure out if they are files, manifests
# or changesets and set the right variable accordingly, but in
# practice, it makes no difference. Reevaluate when GitHgStore.close
# is modified, though.
GitHgHelper.set('file', obj, NULL_NODE_ID)
GitHgHelper.set('file-meta', obj, NULL_NODE_ID)
if not args.commit and not status('broken'):
dangling = GitHgHelper.dangling('git2hg')
for c in dangling:
status.fix('Removing dangling note for commit ' + c)
GitHgHelper.set('changeset-metadata', c, NULL_NODE_ID)
if status('broken'):
status.info(
'Your git-cinnabar repository appears to be corrupted. There\n'
'are known issues in older revisions that have been fixed.\n'
'Please try running the following command to reset:\n'
' git cinnabar reclone\n\n'
'Please note this command may change the commit sha1s. Your\n'
'local branches will however stay untouched.\n'
'Please report any corruption that fsck would detect after a\n'
'reclone.')
if not args.commit:
status.info('Checking head references...')
computed_heads = defaultdict(set)
for branch, head in dag.all_heads():
computed_heads[branch].add(head)
for branch in sorted(dag.tags()):
stored_heads = store.heads({branch})
for head in computed_heads[branch] - stored_heads:
status.fix('Adding missing head %s in branch %s' %
(head, branch))
store.add_head(head)
for head in stored_heads - computed_heads[branch]:
status.fix('Removing non-head reference to %s in branch %s' %
(head, branch))
del store._hgheads[head]
metadata_commit = Git.resolve_ref('refs/cinnabar/metadata')
if status('broken'):
Git.update_ref('refs/cinnabar/broken', metadata_commit)
return 1
if args.full:
Git.update_ref('refs/cinnabar/checked', metadata_commit)
interval_expired('fsck', 0)
store.close()
if status('fixed'):
return 2
return 0