Difference between revisions of "Repository snapshot objects"
m (→Manifest) |
(add pointer to relevant phabricator tasks) |
||
| (3 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
| − | '''WARNING: work in progress blueprint''' | + | * '''WARNING: work in progress blueprint''' |
| + | * '''INFO: the Software Heritage implementation of repository snapshot objects is tracked at [https://forge.softwareheritage.org/T565 T565]''' | ||
== Introduction == | == Introduction == | ||
| Line 5: | Line 6: | ||
A repository snapshot object, or simply '''snapshot object''', is a [https://en.wikipedia.org/wiki/Merkle_tree Merkle] DAG node used to capture the current state of a VCS repository. | A repository snapshot object, or simply '''snapshot object''', is a [https://en.wikipedia.org/wiki/Merkle_tree Merkle] DAG node used to capture the current state of a VCS repository. | ||
| − | Conceptually, a snapshot object is a complete map from repository entry points ("branches" in [[Software Heritage]] terminology, "refs" in Git) to other objects in the repository, including other snapshot objects if repository entry points point to them.<br> | + | Conceptually, a snapshot object is a complete map from repository entry points ("branches" in [[Software Heritage]] terminology, "refs" in Git) to other objects in the repository, |
| − | Practically, the map is serialized into a '''manifest''' consisting of a list of triples ''<object type, object ID, branch name>''. | + | including other snapshot objects if repository entry points point to them.<br> |
| + | Practically, the map is serialized into a '''manifest''' consisting of a list of triples ''<object type, object ID, branch name>'' | ||
| + | (specifying the object ''type'' would not be strictly needed, but it eases traversal, allows for better integrity checking, etc.). | ||
Entries in snapshots can point to the following object kinds: | Entries in snapshots can point to the following object kinds: | ||
| Line 26: | Line 29: | ||
No matter the implementation of the manifest ''itself'', its '''object ID''' is obtained as follows: | No matter the implementation of the manifest ''itself'', its '''object ID''' is obtained as follows: | ||
* take the string obtained by concatenating: | * take the string obtained by concatenating: | ||
| − | + | # the header string "snapshot " (without quotes) | |
| − | + | # the length of the manifest serialized as a decimal integer in ASCII (e.g., "42") | |
| − | + | # the NULL byte "\0" | |
| − | + | # the manifest itself | |
* compute the SHA1 checksum of the obtained string | * compute the SHA1 checksum of the obtained string | ||
This is equivalent to the current implementation of [https://git-scm.com/docs/git-hash-object git-hash-object(1)] with object type set to "snapshot" | This is equivalent to the current implementation of [https://git-scm.com/docs/git-hash-object git-hash-object(1)] with object type set to "snapshot" | ||
| Line 36: | Line 39: | ||
Note: branch/ref names might contain arbitrary characters except the NULL byte itself. | Note: branch/ref names might contain arbitrary characters except the NULL byte itself. | ||
| − | === | + | == Implementation == |
| + | |||
| + | Two possible implementations of repository objects are detailed below, one more in line with Software Heritage conventions, the other more aligned with Git ones. | ||
| + | |||
| + | === a-la Software Heritage === | ||
| + | |||
| + | Repository objects will contain one entry for each branch that would be listed in the occurrence table while visiting an origin. | ||
| + | (In this context "branches" roughly correspond to Git refs.) | ||
| + | Each entry will point to a fully resolved object ID (i.e., a SHA). | ||
| + | The equivalent of Git symbolic refs are not stored in their non-resolved form (i.e., a ref name). | ||
| + | |||
| + | ==== Manifest serialization ==== | ||
A repository object manifest is a list of entries, named and sorted by branch, where each entry is as follows: | A repository object manifest is a list of entries, named and sorted by branch, where each entry is as follows: | ||
| − | + | # object kind (one of: "content", "directory", "release", "revision", "snapshot") | |
| − | + | # ASCII space | |
| − | + | # SHA1 of the target object serialized as a string of ASCII, lowercase hex digits (e.g., "585f6e27f540012af621a18d0155aae2a8ec0276") | |
| − | + | # ASCII space | |
| − | + | # entry name as a sequence of bytes (e.g., "refs/heads/master") | |
| − | + | # NULL byte "\0" | |
| + | |||
| + | === a-la Git === | ||
| + | |||
| + | Repository objects will contain an entry for each ref that would exist in a bare repository. | ||
| + | |||
| + | Possible variants: | ||
| + | * also store symbolic refs, in their non-resolved form (i.e., ref names) in the manifests. To be useful this needs the guarantee that refs pointed by symbolic refs are included in the manifest | ||
| − | === | + | ==== Manifest serialization ==== |
A repository object manifest is a list of entries, named and sorted by ref, where each entry is as follows: | A repository object manifest is a list of entries, named and sorted by ref, where each entry is as follows: | ||
| − | + | # object kind (one of: "blob", "tree", "tag", "commit", "snapshot") | |
| − | + | # ASCII space | |
| − | + | # entry name as a sequence of bytes (e.g., "refs/heads/master") | |
| − | + | # NULL byte "\0" | |
| − | + | # SHA1 of the target object serialized as 20 raw bytes | |
Notes: | Notes: | ||
Latest revision as of 14:38, 15 September 2016
- WARNING: work in progress blueprint
- INFO: the Software Heritage implementation of repository snapshot objects is tracked at T565
Introduction
A repository snapshot object, or simply snapshot object, is a Merkle DAG node used to capture the current state of a VCS repository.
Conceptually, a snapshot object is a complete map from repository entry points ("branches" in Software Heritage terminology, "refs" in Git) to other objects in the repository,
including other snapshot objects if repository entry points point to them.
Practically, the map is serialized into a manifest consisting of a list of triples <object type, object ID, branch name>
(specifying the object type would not be strictly needed, but it eases traversal, allows for better integrity checking, etc.).
Entries in snapshots can point to the following object kinds:
- contents (Git terminology: blobs)
- directories (tree)
- releases (annotated tags)
- revisions (commits)
- snapshots
The object ID of a repository object is the cryptographic hash of its manifest, computed in the usual way for the Merkle DAG.
Manifest
The manifest of a repository object is a canonical representation of it as a sequence of bytes.
Two alternative serialization formats for such manifests are proposed below:
- a-la Software Heritage: how we would implement on our own, not taking into account compatibility with/stylistic choices of other VCSs
- a-la Git: manifest implementation similar to how Git implements manifests for other DAG objects
No matter the implementation of the manifest itself, its object ID is obtained as follows:
- take the string obtained by concatenating:
- the header string "snapshot " (without quotes)
- the length of the manifest serialized as a decimal integer in ASCII (e.g., "42")
- the NULL byte "\0"
- the manifest itself
- compute the SHA1 checksum of the obtained string
This is equivalent to the current implementation of git-hash-object(1) with object type set to "snapshot" (note that to use it you will need to pass --literally, as "snapshot" is currently not a supported Git object type).
Note: branch/ref names might contain arbitrary characters except the NULL byte itself.
Implementation
Two possible implementations of repository objects are detailed below, one more in line with Software Heritage conventions, the other more aligned with Git ones.
a-la Software Heritage
Repository objects will contain one entry for each branch that would be listed in the occurrence table while visiting an origin. (In this context "branches" roughly correspond to Git refs.) Each entry will point to a fully resolved object ID (i.e., a SHA). The equivalent of Git symbolic refs are not stored in their non-resolved form (i.e., a ref name).
Manifest serialization
A repository object manifest is a list of entries, named and sorted by branch, where each entry is as follows:
- object kind (one of: "content", "directory", "release", "revision", "snapshot")
- ASCII space
- SHA1 of the target object serialized as a string of ASCII, lowercase hex digits (e.g., "585f6e27f540012af621a18d0155aae2a8ec0276")
- ASCII space
- entry name as a sequence of bytes (e.g., "refs/heads/master")
- NULL byte "\0"
a-la Git
Repository objects will contain an entry for each ref that would exist in a bare repository.
Possible variants:
- also store symbolic refs, in their non-resolved form (i.e., ref names) in the manifests. To be useful this needs the guarantee that refs pointed by symbolic refs are included in the manifest
Manifest serialization
A repository object manifest is a list of entries, named and sorted by ref, where each entry is as follows:
- object kind (one of: "blob", "tree", "tag", "commit", "snapshot")
- ASCII space
- entry name as a sequence of bytes (e.g., "refs/heads/master")
- NULL byte "\0"
- SHA1 of the target object serialized as 20 raw bytes
Notes:
- there is no separator between entries
- the above is inspired by the compact serialization format of tree objects, but other variants are possible:
- reorder the columns so that entry name comes last and "\0" acts as entry terminator
- serialize SHA1 as ASCII instead of binary (it will take more space, but arguably snapshot objects will be less popular than tree objects)