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 get_checked_metadata(num): if not checked_metadata: return None commit = Git.resolve_ref('{}^{}'.format( checked_metadata.decode('ascii'), num)) if commit: return GitCommit(commit)
def do_rollback(ref): sha1 = Git.resolve_ref(ref) if not sha1: logging.error('Invalid ref: %s', ref) return 1 if sha1 != NULL_NODE_ID: # Validate that the sha1 is in the history of the current metadata metadata = Git.resolve_ref('refs/cinnabar/metadata') while metadata: if sha1 == metadata: break commit = GitCommit(metadata) flags = commit.body.split(' ') if len(commit.parents) == 5 + ('files-meta' in flags): metadata = commit.parents[-1] else: metadata = None if not metadata: logging.error( 'Cannot rollback to %s, it is not in the history of ' 'the current metadata.', ref) return 1 refs = VersionedDict((ref, commit) for commit, ref in Git.for_each_ref( 'refs/cinnabar', 'refs/notes/cinnabar')) for ref in refs: del refs[ref] if sha1 != NULL_NODE_ID: refs['refs/cinnabar/metadata'] = sha1 for line in Git.ls_tree(sha1): mode, typ, commit, path = line refs['refs/cinnabar/replace/%s' % path] = commit for status, ref, commit in refs.iterchanges(): if status == VersionedDict.REMOVED: Git.delete_ref(ref) else: Git.update_ref(ref, commit) Git._close_update_ref() return 0
def fsck_quick(force=False): status = FsckStatus() store = GitHgStore() metadata_commit = Git.resolve_ref('refs/cinnabar/metadata') if not metadata_commit: status.info('There does not seem to be any git-cinnabar metadata.\n' 'Is this a git-cinnabar clone?') return 1 broken_metadata = Git.resolve_ref('refs/cinnabar/broken') checked_metadata = Git.resolve_ref('refs/cinnabar/checked') if checked_metadata == broken_metadata: checked_metadata = None if metadata_commit == checked_metadata and not force: status.info('The git-cinnabar metadata was already checked and is ' 'presumably clean.\n' 'Try `--force` if you want to check anyways.') return 0 elif force: checked_metadata = None commit = GitCommit(metadata_commit) if commit.body != 'files-meta unified-manifests-v2': status.info( 'The git-cinnabar metadata is incompatible with this version.\n' 'Please use the git-cinnabar version it was used with last.\n') return 1 if len(commit.parents) > 6 or len(commit.parents) < 5: status.report('The git-cinnabar metadata seems to be corrupted in ' 'unexpected ways.\n') return 1 changesets, manifests, hg2git, git2hg, files_meta = commit.parents[:5] commit = GitCommit(changesets) heads = OrderedDict( (node, branch) for node, _, branch in (d.partition(' ') for d in commit.body.splitlines())) if len(heads) != len(commit.parents): status.report('The git-cinnabar metadata seems to be corrupted in ' 'unexpected ways.\n') return 1 manifest_nodes = [] parents = None fix_changeset_heads = False def get_checked_metadata(num): if not checked_metadata: return None commit = Git.resolve_ref('{}^{}'.format(checked_metadata, num)) if commit: return GitCommit(commit) checked_commit = get_checked_metadata(1) # TODO: Check that the recorded heads are actually dag heads. for c, changeset_node in progress_iter( 'Checking {} changeset heads', ((c, node) for c, node in izip(commit.parents, heads) if not checked_commit or c not in checked_commit.parents)): gitsha1 = GitHgHelper.hg2git(changeset_node) if gitsha1 == NULL_NODE_ID: status.report('Missing hg2git metadata for changeset %s' % changeset_node) continue if gitsha1 != c: if parents is None: parents = set(commit.parents) if gitsha1 not in parents: status.report('Inconsistent metadata:\n' ' Head metadata says changeset %s maps to %s\n' ' but hg2git metadata says it maps to %s' % (changeset_node, c, gitsha1)) continue fix_changeset_heads = True changeset = store._changeset(c, include_parents=True) if not changeset: status.report('Missing git2hg metadata for git commit %s' % c) continue if changeset.node != changeset_node: if changeset.node not in heads: status.report( 'Inconsistent metadata:\n' ' Head metadata says %s maps to changeset %s\n' ' but git2hg metadata says it maps to changeset %s' % (c, changeset_node, changeset.node)) continue fix_changeset_heads = True if changeset.node != changeset.sha1: status.report('Sha1 mismatch for changeset %s' % changeset.node) continue changeset_branch = changeset.branch or 'default' if heads[changeset.node] != changeset_branch: status.report( 'Inconsistent metadata:\n' ' Head metadata says changeset %s is in branch %s\n' ' but git2hg metadata says it is in branch %s' % (changeset.node, heads[changeset.node], changeset_branch)) continue manifest_nodes.append(changeset.manifest) if status('broken'): return 1 # Rebuilding manifests benefits from limiting the difference with # the last rebuilt manifest. Similarly, building the list of unique # files in all manifests benefits from that too. # Unfortunately, the manifest heads are not ordered in a topological # relevant matter, and the differences between two consecutive manifests # can be much larger than they could be. The consequence is spending a # large amount of time rebuilding the manifests and gathering the files # list. It's actually faster to attempt to reorder them according to # some heuristics first, such that the differences are smaller. # Here, we use the depth from the root node(s) to reorder the manifests. # This doesn't give the most optimal ordering, but it's already much # faster. On a clone of multiple mozilla-* repositories with > 1400 heads, # it's close to an order of magnitude difference on the "Checking # manifests" loop. depths = {} roots = {} manifest_queue = [] revs = [] revs.append('{}^@'.format(manifests)) if checked_metadata: revs.append('^{}^2^@'.format(checked_metadata)) for m, _, parents in progress_iter( 'Loading {} manifests', GitHgHelper.rev_list('--topo-order', '--reverse', '--full-history', *revs)): manifest_queue.append((m, parents)) if parents: depth = {} for p in parents: for root, num in depths.get(p, {}).iteritems(): if root in depth: depth[root] = max(depth[root], num + 1) else: depth[root] = num + 1 if depth: depths[m] = depth del depth continue depths[m] = {m: 0} roots[m] = parents if status('broken'): return 1 # TODO: check that all manifest_nodes gathered above are available in the # manifests dag, and that the dag heads are the recorded heads. manifests_commit = GitCommit(manifests) checked_commit = get_checked_metadata(2) depths = [([depths[p].get(r, 0) for r in roots], p) for p in manifests_commit.parents if not checked_commit or p not in checked_commit.parents] manifests_commit_parents = [p for _, p in sorted(depths)] previous = None all_interesting = set() for m in progress_iter('Checking {} manifest heads', manifests_commit_parents): c = GitCommit(m) if not SHA1_RE.match(c.body): status.report('Invalid manifest metadata in git commit %s' % m) continue gitsha1 = GitHgHelper.hg2git(c.body) if gitsha1 == NULL_NODE_ID: status.report('Missing hg2git metadata for manifest %s' % c.body) continue if not GitHgHelper.check_manifest(c.body): status.report('Sha1 mismatch for manifest %s' % c.body) files = {} if previous: for _, _, before, after, d, path in GitHgHelper.diff_tree( previous, m): if d in 'AM' and before != after and \ (path, after) not in all_interesting: files[path] = after else: for _, t, sha1, path in GitHgHelper.ls_tree(m, recursive=True): if (path, sha1) not in all_interesting: files[path] = sha1 all_interesting.update(files.iteritems()) previous = m if status('broken'): return 1 # Don't check files that were already there in the previously checked # manifests. previous = None for parents in roots.itervalues(): for p in parents: if previous: for _, _, before, after, d, path in GitHgHelper.diff_tree( previous, p): if d in 'AM' and before != after: all_interesting.discard((path, after)) else: for _, t, sha1, path in GitHgHelper.ls_tree(p, recursive=True): all_interesting.discard((path, sha1)) previous = p progress = Progress('Checking {} files') while all_interesting and manifest_queue: (m, parents) = manifest_queue.pop() changes = get_changes(m, parents, all=True) for path, hg_file, hg_fileparents in changes: if hg_fileparents[1:] == (hg_file, ): continue elif hg_fileparents[:1] == (hg_file, ): continue # Reaching here means the file received a modification compared # to its parents. If it's a file we're going to check below, # it means we don't need to check its parents if somehow they were # going to be checked. If it's not a file we're going to check # below, it's because it's either a file we weren't interested in # in the first place, or it's the parent of a file we have checked. # Either way, we aren't interested in the parents. for p in hg_fileparents: all_interesting.discard((path, p)) if (path, hg_file) not in all_interesting: continue all_interesting.remove((path, hg_file)) if not GitHgHelper.check_file(hg_file, *hg_fileparents): p = store.manifest_path(path) status.report('Sha1 mismatch for file %s\n' ' revision %s' % (p, hg_file)) print_parents = ' '.join(p for p in hg_fileparents if p != NULL_NODE_ID) if print_parents: status.report(' with parent%s %s' % ('s' if len(print_parents) > 41 else '', print_parents)) progress.progress() progress.finish() if all_interesting: status.info('Could not find the following files:') for path, sha1 in sorted(all_interesting): p = store.manifest_path(path) status.info(' %s %s' % (sha1, path)) status.info('This might be a bug in `git cinnabar fsck`. Please open ' 'an issue, with the message above, on\n' 'https://github.com/glandium/git-cinnabar/issues') return 1 if status('broken'): status.info('Your git-cinnabar repository appears to be corrupted.\n' 'Please open an issue, with the information above, on\n' 'https://github.com/glandium/git-cinnabar/issues') Git.update_ref('refs/cinnabar/broken', metadata_commit) if checked_metadata: status.info( '\nThen please try to run `git cinnabar rollback --fsck` to ' 'restore last known state, and to update from the mercurial ' 'repository.') else: status.info('\nThen please try to run `git cinnabar reclone`.') status.info( '\nPlease note this may affect the commit sha1s of mercurial ' 'changesets, and may require to rebase your local branches.') status.info( '\nAlternatively, you may start afresh with a new clone. In any ' 'case, please keep this corrupted repository around for further ' 'debugging.') return 1 refresh = [] if fix_changeset_heads: status.fix('Fixing changeset heads metadata order.') refresh.append('refs/cinnabar/changesets') interval_expired('fsck', 0) store.close(refresh=refresh) GitHgHelper._helper = False metadata_commit = Git.resolve_ref('refs/cinnabar/metadata') Git.update_ref('refs/cinnabar/checked', metadata_commit) return 0
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 create_hg_metadata(self, commit, parents): if check_enabled('bundle'): real_changeset_data = self.read_changeset_data(commit) manifest = 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_data and (manifest.node != real_changeset_data['manifest']): for path, created, real in sorted_merge( manifest._lines, self.manifest( real_changeset_data['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._push_manifests[manifest.node] = manifest self.manifest_ref(manifest.node, hg2git=False, create=True) self._manifest_git_tree[manifest.node] = commit_data.tree extra = {} if commit_data.author != commit_data.committer: committer = self.hg_author_info(commit_data.committer) extra['committer'] = '%s %d %d' % committer if parents: parent_changeset_data = self.read_changeset_data(parents[0]) branch = parent_changeset_data.get('extra', {}).get('branch') if branch: extra['branch'] = branch changeset_data = self._changeset_data_cache[commit] = { 'files': sorted(chain(manifest.removed, manifest.modified)), 'manifest': manifest.node, } if extra: changeset_data['extra'] = extra changeset = self._changeset(commit, include_parents=True) if self._graft is True and parents and changeset.data[-1] == '\n': parent_cs = self._changeset(parents[0], skip_patch=True) if 'patch' not in self._changeset_data_cache[parents[0]]: self._graft = False else: patch = self._changeset_data_cache[parents[0]]['patch'][-1] self._graft = (patch[1] == len(parent_cs.data) and parent_cs.data[-1] == '\n') if self._graft: self._graft = 'true' if self._graft == 'true' and changeset.data[-1] == '\n': changeset.data = changeset.data[:-1] changeset_data['patch'] = ((len(changeset.data), len(changeset.data) + 1, ''), ) changeset_data['changeset'] = changeset.changeset = changeset.node = \ changeset.sha1 self._push_changesets[changeset.node] = changeset # This is a horrible way to do this, but this method is not doing much # better overall anyways. if extra: if 'committer' in extra: del extra['committer'] if not extra: del changeset_data['extra'] self._changesets[changeset.node] = PseudoString(commit) if check_enabled('bundle') and real_changeset_data: error = False for k in ('files', 'manifest'): if real_changeset_data.get(k, []) != changeset_data.get(k): logging.error('(%s) %r != %r', k, real_changeset_data.get(k), changeset_data.get(k)) error = True if error: raise Exception('Changeset mismatch')
def test_store_changeset(self): files = {} f = File() f.content = b'foo\n' f.node = f.sha1 chunk = f.to_chunk(self.RevChunk) GitHgHelper.store(b'file', chunk) files[f.node] = GitHgHelper.hg2git(chunk.node) f2 = File() f2.content = b'bar\n' f2.node = f2.sha1 chunk = f2.to_chunk(self.RevChunk) GitHgHelper.store(b'file', chunk) files[f2.node] = GitHgHelper.hg2git(chunk.node) m = Manifest() m.add(b'bar', f.node) m.add(b'foo/.bar', f.node) m.add(b'foo/.foo', f.node) m.add(b'foo/bar/baz', f.node) m.add(b'foo/bar/foo', f.node) m.add(b'foo/bar/qux', f.node) m.add(b'foo/foo', f.node) m.add(b'foo/hoge', f.node) m.add(b'foo/qux', f.node) m.add(b'qux', f.node) m.node = m.sha1 chunk = m.to_chunk(self.RevChunk) GitHgHelper.store(b'manifest', chunk) store = GitHgStore() c = Changeset() c.manifest = m.node c.author = b'Cinnabar test <cinnabar@test>' c.timestamp = b'0' c.utcoffset = b'0' c.files = [i.path for i in m] c.body = b'Test commit' c.node = c.sha1 store.store_changeset(c) c_gen = store.changeset(c.node) self.assertEqual(c.raw_data, c_gen.raw_data) commit = GitCommit(GitHgHelper.hg2git(c.node)) self.assertEqual(commit.body, c.body) ct = self.commit_tree(m, files) self.assertEqual(commit.tree, ct) # Weird case as seen in the GNU octave repo. # The bar subdirectory is supposed to be transposed to the same # content as the git tree for the manifest above. m2 = Manifest() m2.add(b'bar/bar', f.node) m2.add(b'bar/foo/.foo', f.node) m2.add(b'bar/foo//.bar', f.node) m2.add(b'bar/foo//.foo', f2.node) m2.add(b'bar/foo//bar/baz', f2.node) m2.add(b'bar/foo//bar/foo', f.node) m2.add(b'bar/foo//hoge', f.node) m2.add(b'bar/foo/bar/baz', f.node) m2.add(b'bar/foo/bar/qux', f.node) m2.add(b'bar/foo/foo', f.node) m2.add(b'bar/foo/qux', f.node) m2.add(b'bar/qux', f.node) m2.node = m2.sha1 chunk = m2.to_chunk(self.RevChunk, m) GitHgHelper.store(b'manifest', chunk) c2 = Changeset() c2.parent1 = c.node c2.manifest = m2.node c2.author = b'Cinnabar test <cinnabar@test>' c2.timestamp = b'0' c2.utcoffset = b'0' c2.files = [i.path for i in m2] c2.body = b'Test commit' c2.node = c2.sha1 store.store_changeset(c2) c2_gen = store.changeset(c2.node) self.assertEqual(c2.raw_data, c2_gen.raw_data) commit = GitCommit(GitHgHelper.hg2git(c2.node)) self.assertEqual(commit.body, c2.body) self.assertEqual(ct, one(Git.ls_tree(commit.tree, b'bar'))[2]) # Corner case: empty manifest m3 = Manifest() m3.node = m3.sha1 self.assertEqual(b'b80de5d138758541c5f05265ad144ab9fa86d1db', m3.node) chunk = m3.to_chunk(self.RevChunk, m2) GitHgHelper.store(b'manifest', chunk) commit = GitCommit(GitHgHelper.hg2git(m3.node)) self.assertEqual(EMPTY_TREE, commit.tree) c3 = Changeset() c3.parent1 = c2.node c3.manifest = m3.node c3.author = b'Cinnabar test <cinnabar@test>' c3.timestamp = b'0' c3.utcoffset = b'0' c3.body = b'Test commit' c3.node = c3.sha1 store.store_changeset(c3) c3_gen = store.changeset(c3.node) self.assertEqual(c3.raw_data, c3_gen.raw_data) commit = GitCommit(GitHgHelper.hg2git(c3.node)) self.assertEqual(commit.body, c3.body) self.assertEqual(EMPTY_TREE, commit.tree) # Corner case: null manifest c4 = Changeset() c4.parent1 = c3.node c4.manifest = NULL_NODE_ID c4.author = b'Cinnabar test <cinnabar@test>' c4.timestamp = b'0' c4.utcoffset = b'0' c4.body = b'Test commit' c4.node = c4.sha1 store.store_changeset(c4) c4_gen = store.changeset(c4.node) self.assertEqual(c4.raw_data, c4_gen.raw_data) commit = GitCommit(GitHgHelper.hg2git(c4.node)) self.assertEqual(commit.body, c4.body) self.assertEqual(EMPTY_TREE, commit.tree) # Corner case: identical changeset with a difference that wouldn't # appear in the git commit without adjustment (which is: cinnabar adds # a nul character to the commit message.. chunk = c2.to_chunk(RawRevChunk02) c5 = Changeset.from_chunk(chunk) c5.branch = b'branched' c5.node = c5.sha1 store.store_changeset(c5) c5_gen = store.changeset(c5.node) self.assertEqual(c5.raw_data, c5_gen.raw_data) commit = GitCommit(GitHgHelper.hg2git(c5.node)) self.assertEqual(commit.body, c5.body + b'\0') self.assertEqual(ct, one(Git.ls_tree(commit.tree, b'bar'))[2])
def test_store_manifest(self): m = Manifest() m.add(b'foo', b'1' * 40) m.add(b'hoge', b'2' * 40) m.node = m.sha1 chunk = m.to_chunk(self.RevChunk) GitHgHelper.store(b'manifest', chunk) git_m = GitHgHelper.hg2git(chunk.node) self.assertEqual(GitCommit(git_m).tree, self.manifest_tree(m)) m2 = Manifest() m2.parent1 = m.node m2.items.append(m.items[0]) m2.add(b'fuga', b'3' * 40) m2.items.append(m.items[1]) m2.node = m2.sha1 chunk = m2.to_chunk(self.RevChunk, m) GitHgHelper.store(b'manifest', chunk) git_m = GitHgHelper.hg2git(chunk.node) self.assertEqual(GitCommit(git_m).tree, self.manifest_tree(m2)) m3 = Manifest() m3.parent1 = m.node m3.items.append(m.items[0]) m3.add(b'fuga/bar/foo', b'3' * 40) m3.add(b'fuga/bar/qux', b'4' * 40) m3.add(b'fuga/foo', b'5' * 40, b'x') m3.add(b'fuga/fuga/bar', b'6' * 40) m3.add(b'fuga/fuga/baz', b'7' * 40, b'l') m3.add(b'fuga/fuga/qux', b'8' * 40) m3.add(b'hoge', b'9' * 40) m3.node = m3.sha1 if self.RevChunk == RawRevChunk01: delta_node = m2 else: delta_node = m chunk = m3.to_chunk(self.RevChunk, delta_node) GitHgHelper.store(b'manifest', chunk) git_m = GitHgHelper.hg2git(chunk.node) self.assertEqual(GitCommit(git_m).tree, self.manifest_tree(m3)) m4 = Manifest() m4.parents = (m2.node, m3.node) for item in m3.items: m4.items.append(item) m4.node = m4.sha1 if self.RevChunk == RawRevChunk01: delta_node = m3 else: delta_node = m2 chunk = m4.to_chunk(self.RevChunk, delta_node) GitHgHelper.store(b'manifest', chunk) git_m = GitHgHelper.hg2git(chunk.node) self.assertEqual(GitCommit(git_m).tree, self.manifest_tree(m4)) m5 = Manifest() m5.parent1 = m4.node for item in chain(m4.items[:2], m4.items[5:]): m5.items.append(item) m5.node = m5.sha1 chunk = m5.to_chunk(self.RevChunk, m4) GitHgHelper.store(b'manifest', chunk) git_m = GitHgHelper.hg2git(chunk.node) self.assertEqual(GitCommit(git_m).tree, self.manifest_tree(m5)) m6 = Manifest() m6.parent1 = m5.node for item in m4.items: m6.items.append(item) m6.node = m6.sha1 self.assertEqual(m4.raw_data, m6.raw_data) chunk = m6.to_chunk(self.RevChunk, m5) GitHgHelper.store(b'manifest', chunk) git_m = GitHgHelper.hg2git(chunk.node) self.assertEqual(GitCommit(git_m).tree, self.manifest_tree(m6)) m7 = Manifest() for item in m3.items: m7.items.append(item) m7.node = m7.sha1 chunk = m7.to_chunk(self.RevChunk) GitHgHelper.store(b'manifest', chunk) git_m = GitHgHelper.hg2git(chunk.node) self.assertEqual(GitCommit(git_m).tree, self.manifest_tree(m7)) m8 = Manifest() for item in chain(m3.items[:3], m3.items[7:]): m8.items.append(item) m8.node = m8.sha1 chunk = m8.to_chunk(self.RevChunk, m7) GitHgHelper.store(b'manifest', chunk) git_m = GitHgHelper.hg2git(chunk.node) self.assertEqual(GitCommit(git_m).tree, self.manifest_tree(m8))
def test_store_changeset(self): files = {} f = File() f.content = b'foo\n' f.node = f.sha1 chunk = f.to_chunk(self.RevChunk) GitHgHelper.store(b'file', chunk) files[f.node] = GitHgHelper.hg2git(chunk.node) f2 = File() f2.content = b'bar\n' f2.node = f2.sha1 chunk = f2.to_chunk(self.RevChunk) GitHgHelper.store(b'file', chunk) files[f2.node] = GitHgHelper.hg2git(chunk.node) m = Manifest() m.add(b'bar', f.node) m.add(b'foo/.bar', f.node) m.add(b'foo/.foo', f.node) m.add(b'foo/bar/baz', f.node) m.add(b'foo/bar/foo', f.node) m.add(b'foo/bar/qux', f.node) m.add(b'foo/foo', f.node) m.add(b'foo/hoge', f.node) m.add(b'foo/qux', f.node) m.add(b'qux', f.node) m.node = m.sha1 chunk = m.to_chunk(self.RevChunk) GitHgHelper.store(b'manifest', chunk) store = GitHgStore() c = Changeset() c.manifest = m.node c.author = b'Cinnabar test <cinnabar@test>' c.timestamp = b'0' c.utcoffset = b'0000' c.files = [i.path for i in m] c.body = b'Test commit' c.node = c.sha1 store.store_changeset(c) c_gen = store.changeset(c.node) self.assertEqual(c.raw_data, c_gen.raw_data) commit = GitCommit(GitHgHelper.hg2git(c.node)) self.assertEqual(commit.body, c.body) ct = self.commit_tree(m, files) self.assertEqual(commit.tree, ct) # Weird case as seen in the GNU octave repo. # The bar subdirectory is supposed to be transposed to the same # content as the git tree for the manifest above. m2 = Manifest() m2.add(b'bar/bar', f.node) m2.add(b'bar/foo/.foo', f.node) m2.add(b'bar/foo//.bar', f.node) m2.add(b'bar/foo//.foo', f2.node) m2.add(b'bar/foo//bar/baz', f2.node) m2.add(b'bar/foo//bar/foo', f.node) m2.add(b'bar/foo//hoge', f.node) m2.add(b'bar/foo/bar/baz', f.node) m2.add(b'bar/foo/bar/qux', f.node) m2.add(b'bar/foo/foo', f.node) m2.add(b'bar/foo/qux', f.node) m2.add(b'bar/qux', f.node) m2.node = m2.sha1 chunk = m2.to_chunk(self.RevChunk, m) GitHgHelper.store(b'manifest', chunk) c2 = Changeset() c2.parent1 = c.node c2.manifest = m2.node c2.author = b'Cinnabar test <cinnabar@test>' c2.timestamp = b'0' c2.utcoffset = b'0000' c2.files = [i.path for i in m2] c2.body = b'Test commit' c2.node = c2.sha1 store.store_changeset(c2) c2_gen = store.changeset(c2.node) self.assertEqual(c2.raw_data, c2_gen.raw_data) commit = GitCommit(GitHgHelper.hg2git(c2.node)) self.assertEqual(commit.body, c2.body) self.assertEqual(ct, one(Git.ls_tree(commit.tree, b'bar'))[2])
def get_previous_metadata(metadata): commit = GitCommit(metadata) flags = commit.body.split(b' ') if len(commit.parents) == 5 + (b'files-meta' in flags): return commit.parents[-1]