1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
|
********
Revfiles
********
The unit for compressed storage in bzr is a *revfile*, whose design
was suggested by Matt Mackall.
Requirements
============
Compressed storage is a tradeoff between several goals:
* Reasonably compact storage of long histories.
* Robustness and simplicity.
* Fast extraction of versions and addition of new versions (preferably
without rewriting the whole file, or reading the whole history.)
* Fast and precise annotations.
* Storage of files of at least a few hundred MB.
Design
======
revfiles store the history of a single logical file, which is
identified in bzr by its file-id. In this sense they are similar to
an RCS or CVS ``,v`` file or an SCCS sfile.
Each state of the file is called a *text*.
Renaming, adding and deleting this file is handled at a higher level
by the inventory system, and is outside the scope of the revfile. The
revfile name is typically based on the file id which is itself
typically based on the name the file had when it was first added. But
this is purely cosmetic.
For example a file now called ``frob.c`` may have the id
``frobber.c-12873`` because it was originally called
``frobber.c``. Its texts are kept in the revfile
``.bzr/revfiles/frobber.c-12873.revs``.
When the file is deleted from the inventory the revfile does not
change. It's just not used in reproducing trees from that point
onwards.
The revfile does not record the date when the text was added, a commit
message, properties, or any other metadata. That is handled in the
higher-level revision history.
Inventories and other metadata files that vary from one version to the
next can themselves be stored in revfiles.
revfiles store files as simple byte streams, with no consideration of
translating character sets, line endings, or keywords. Those are also
handled at a higher level. However, the revfile may make use of
knowledge that a file is line-based in generating a diff.
(The Python builtin difflib is too slow when generating a purely
byte-by-byte delta so we always make a line-by-line diff; when this
is fixed it may be feasible to use line-by-line diffs for all
files.)
Files whose text does not change from one revision to the next are
stored as just a single text in the revfile. This can happen even if
the file was renamed or other properties were changed in the
inventory.
The revfile is held on disk as two files: an *index* and a *data*
file. The index file is short and always read completely into memory;
the data file is much longer and only the relevant bits of it,
identified by the index file, need to be read.
In previous versions, the index file identified texts by their
SHA-1 digest. This was unsatisfying for two reasons. Firstly it
assumes that SHA-1 will not collide, which is not an assumption we
wish to make in long-lived files. Secondly for annotations we need
to be able to map from file versions back to a revision.
Texts are identified by the name of the revfile and a UUID
corresponding to the first revision in which they were first
introduced. This means that given a text we can identify which
revision it belongs to, and annotations can use the index within the
revfile to identify where a region was first introduced.
We cannot identify texts by the integer revision number, because
that would limit us to only referring to a file in a particular
branch.
I'd like to just use the revision-id, but those are variable-length
strings, and I'd like the revfile index to be fixed-length and
relatively short. UUIDs can be encoded in binary as only 16 bytes.
Perhaps we should just use UUIDs for revisions and be done?
This is meant to scale to hold 100,000 revisions of a single file, by
which time the index file will be ~4.8MB and a bit big to read
sequentially.
Some of the reserved fields could be used to implement a (semi?)
balanced tree indexed by SHA1 so we can much more efficiently find the
index associated with a particular hash. For 100,000 revs we would be
able to find it in about 17 random reads, which is not too bad.
This performs pretty well except when trying to calculate deltas of
really large files. For that the main thing would be to plug in
something faster than difflib, which is after all pure Python.
Another approach is to just store the gzipped full text of big files,
though perhaps that's too perverse?
Skip-deltas
-----------
Because the basis of a delta does not need to be the text's logical
predecessor, we can adjust the deltas to avoid ever needing to apply
too many deltas to reproduce a particular file.
Annotations
-----------
Annotations indicate which revision of a file first inserted a line
(or region of bytes).
Given a string, we can write annotations on it like so: a sequence of
*(index, length)* pairs, giving the *index* of the revision which
introduced the next run of *length* bytes. The sum of the lengths
must equal the length of the string. For text files the regions will
typically fall on line breaks. This can be transformed in memory to
other structures, such as a list of *(index, content)* pairs.
When a line was inserted from a merge revision then the annotation for
that line should still be the source in the merged branch, rather than
just being the revision in which the merge took place.
They can cheaply be calculated when inserting a new text, but are
expensive to calculate after the fact because that requires searching
back through all previous text and all texts which were merged in. It
therefore seems sensible to calculate them once and store them.
To do this we need two operators which update an existing annotated
file:
A. Given an annotated file and a working text, update the annotation to
mark regions inserted in the working file as new in this revision.
B. Given two annotated files, merge them to produce an annotated
result. When there are conflicts, both texts should be included
and annotated.
These may be repeated: after a merge there may be another merge, or
there may be manual fixups or conflict resolutions.
So what we require is given a diff or a diff3 between two files, map
the regions of bytes changed into corresponding updates to the origin
annotations.
Open issues
===========
* revfiles use unsigned 32-bit integers both in diffs and the index.
This should be more than enough for any reasonable source file but
perhaps not enough for large binaries that are frequently committed.
Perhaps for those files there should be an option to continue to use
the text-store. There is unlikely to be any benefit in holding
deltas between them, and deltas will anyhow be hard to calculate.
* The append-only design does not allow for destroying committed data,
as when confidential information is accidentally added. That could
be fixed by creating the fixed repository as a separate branch, into
which only the preserved revisions are exported.
* Should annotations also indicate where text was deleted?
* This design calls for only one annotation per line, which seems
standard. However, this is lacking in at least two cases:
- Lines which originate in the same way in more than one revision,
through being independently introduced. In this case we would
apparently have to make an arbitrary choice; I suppose branches
could prefer to assume lines originated in their own history.
- It might be useful to directly indicate which mergers included
which lines. We do have that information in the revision history
though, so there seems no need to store it for every line.
|