bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2005 Canonical Ltd
|
1185.16.12
by Martin Pool
- basic testament class |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1185.16.12
by Martin Pool
- basic testament class |
16 |
|
17 |
"""Testament - a summary of a revision for signing.
|
|
18 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
19 |
A testament can be defined as "something that serves as tangible
|
1185.16.12
by Martin Pool
- basic testament class |
20 |
proof or evidence." In bzr we use them to allow people to certify
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
21 |
particular revisions as authentic.
|
1185.16.12
by Martin Pool
- basic testament class |
22 |
|
1185.16.19
by Martin Pool
- testament now contains summary of parents and inventory |
23 |
The goal is that if two revisions are semantically equal, then they will
|
24 |
have a byte-for-byte equal testament. We can define different versions of
|
|
25 |
"semantically equal" by using different testament classes; e.g. one that
|
|
26 |
includes or ignores file-ids.
|
|
27 |
||
1185.16.12
by Martin Pool
- basic testament class |
28 |
We sign a testament rather than the revision XML itself for several reasons.
|
29 |
The most important is that the form in which the revision is stored
|
|
30 |
internally is designed for that purpose, and contains information which need
|
|
31 |
not be attested to by the signer. For example the inventory contains the
|
|
32 |
last-changed revision for a file, but this is not necessarily something the
|
|
33 |
user cares to sign.
|
|
34 |
||
35 |
Having unnecessary fields signed makes the signatures brittle when the same
|
|
36 |
revision is stored in different branches or when the format is upgraded.
|
|
37 |
||
38 |
Handling upgrades is another motivation for using testaments separate from
|
|
39 |
the stored revision. We would like to be able to compare a signature
|
|
40 |
generated from an old-format tree to newer tree, or vice versa. This could
|
|
41 |
be done by comparing the revisions but that makes it unclear about exactly
|
|
42 |
what is being compared or not.
|
|
43 |
||
44 |
Different signing keys might indicate different levels of trust; we can in
|
|
45 |
the future extend this to allow signatures indicating not just that a
|
|
46 |
particular version is authentic but that it has other properties.
|
|
1185.16.19
by Martin Pool
- testament now contains summary of parents and inventory |
47 |
|
48 |
The signature can be applied to either the full testament or to just a
|
|
49 |
hash of it.
|
|
50 |
||
51 |
Testament format 1
|
|
52 |
~~~~~~~~~~~~~~~~~~
|
|
53 |
||
54 |
* timestamps are given as integers to avoid rounding errors
|
|
55 |
* parents given in lexicographical order
|
|
56 |
* indented-text form similar to log; intended to be human readable
|
|
57 |
* paths are given with forward slashes
|
|
58 |
* files are named using paths for ease of comparison/debugging
|
|
59 |
* the testament uses unix line-endings (\n)
|
|
1185.16.12
by Martin Pool
- basic testament class |
60 |
"""
|
61 |
||
6379.6.7
by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear. |
62 |
from __future__ import absolute_import |
63 |
||
1185.16.19
by Martin Pool
- testament now contains summary of parents and inventory |
64 |
# XXX: At the moment, clients trust that the graph described in a weave
|
65 |
# is accurate, but that's not covered by the testament. Perhaps the best
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
66 |
# fix is when verifying a revision to make sure that every file mentioned
|
1185.16.19
by Martin Pool
- testament now contains summary of parents and inventory |
67 |
# in the revision has compatible ancestry links.
|
68 |
||
1185.16.22
by Martin Pool
- more testament development |
69 |
# TODO: perhaps write timestamp in a more readable form
|
70 |
||
1185.16.24
by Martin Pool
- add and test 'testament' builtin command |
71 |
# TODO: Perhaps these should just be different formats in which inventories/
|
72 |
# revisions can be serialized.
|
|
73 |
||
1185.16.59
by mbp at sourcefrog
- store revprops in testaments |
74 |
from copy import copy |
1185.16.15
by Martin Pool
- test text form for testaments |
75 |
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
76 |
from .osutils import ( |
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
77 |
contains_whitespace, |
78 |
contains_linebreaks, |
|
5849.1.2
by Jelmer Vernooij
Use osutils.sha_strings. |
79 |
sha_strings, |
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
80 |
)
|
6973.6.2
by Jelmer Vernooij
Fix more tests. |
81 |
from .sixish import text_type |
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
82 |
from .tree import Tree |
1185.16.38
by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils |
83 |
|
1930.2.2
by John Arbash Meinel
Avoid needless encode/decode. Only encode at the boundary (as suggested by hpk) |
84 |
|
1185.16.12
by Martin Pool
- basic testament class |
85 |
class Testament(object): |
86 |
"""Reduced summary of a revision. |
|
87 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
88 |
Testaments can be
|
1185.16.12
by Martin Pool
- basic testament class |
89 |
|
90 |
- produced from a revision
|
|
1185.21.6
by Jelmer Vernooij
Fix typo |
91 |
- written to a stream
|
1185.16.12
by Martin Pool
- basic testament class |
92 |
- loaded from a stream
|
93 |
- compared to a revision
|
|
94 |
"""
|
|
95 |
||
1551.7.1
by Aaron Bentley
Implement --strict at commandline, fix up strict format |
96 |
long_header = 'bazaar-ng testament version 1\n' |
7045.2.11
by Jelmer Vernooij
Fix some testament tests. |
97 |
short_header = 'bazaar-ng testament short form 1\n' |
5798.1.1
by Jelmer Vernooij
Make Testament take a tree rather than a inventory. |
98 |
include_root = False |
1551.7.1
by Aaron Bentley
Implement --strict at commandline, fix up strict format |
99 |
|
1185.16.12
by Martin Pool
- basic testament class |
100 |
@classmethod
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
101 |
def from_revision(cls, repository, revision_id): |
5798.1.1
by Jelmer Vernooij
Make Testament take a tree rather than a inventory. |
102 |
"""Produce a new testament from a historical revision.""" |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
103 |
rev = repository.get_revision(revision_id) |
5798.1.1
by Jelmer Vernooij
Make Testament take a tree rather than a inventory. |
104 |
tree = repository.revision_tree(revision_id) |
105 |
return cls(rev, tree) |
|
106 |
||
107 |
@classmethod
|
|
108 |
def from_revision_tree(cls, tree): |
|
109 |
"""Produce a new testament from a revision tree.""" |
|
110 |
rev = tree._repository.get_revision(tree.get_revision_id()) |
|
111 |
return cls(rev, tree) |
|
112 |
||
113 |
def __init__(self, rev, tree): |
|
114 |
"""Create a new testament for rev using tree.""" |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
115 |
self.revision_id = rev.revision_id |
1442.1.62
by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions. |
116 |
self.committer = rev.committer |
117 |
self.timezone = rev.timezone or 0 |
|
118 |
self.timestamp = rev.timestamp |
|
119 |
self.message = rev.message |
|
120 |
self.parent_ids = rev.parent_ids[:] |
|
5798.1.3
by Jelmer Vernooij
Raise error when an invalid second argument to Testament is specified. |
121 |
if not isinstance(tree, Tree): |
122 |
raise TypeError("As of bzr 2.4 Testament.__init__() takes a " |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
123 |
"Revision and a Tree.") |
5798.1.1
by Jelmer Vernooij
Make Testament take a tree rather than a inventory. |
124 |
self.tree = tree |
1442.1.62
by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions. |
125 |
self.revprops = copy(rev.properties) |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
126 |
if contains_whitespace(self.revision_id): |
127 |
raise ValueError(self.revision_id) |
|
128 |
if contains_linebreaks(self.committer): |
|
129 |
raise ValueError(self.committer) |
|
1185.16.15
by Martin Pool
- test text form for testaments |
130 |
|
1185.16.22
by Martin Pool
- more testament development |
131 |
def as_text_lines(self): |
132 |
"""Yield text form as a sequence of lines. |
|
1185.16.15
by Martin Pool
- test text form for testaments |
133 |
|
134 |
The result is returned in utf-8, because it should be signed or
|
|
135 |
hashed in that encoding.
|
|
136 |
"""
|
|
1185.16.22
by Martin Pool
- more testament development |
137 |
r = [] |
1553.3.2
by Marien Zwart
Remove a useless local function. |
138 |
a = r.append |
1551.7.1
by Aaron Bentley
Implement --strict at commandline, fix up strict format |
139 |
a(self.long_header) |
7045.2.11
by Jelmer Vernooij
Fix some testament tests. |
140 |
a('revision-id: %s\n' % self.revision_id.decode('utf-8')) |
1185.16.22
by Martin Pool
- more testament development |
141 |
a('committer: %s\n' % self.committer) |
142 |
a('timestamp: %d\n' % self.timestamp) |
|
143 |
a('timezone: %d\n' % self.timezone) |
|
1185.16.15
by Martin Pool
- test text form for testaments |
144 |
# inventory length contains the root, which is not shown here
|
1185.16.22
by Martin Pool
- more testament development |
145 |
a('parents:\n') |
1185.16.19
by Martin Pool
- testament now contains summary of parents and inventory |
146 |
for parent_id in sorted(self.parent_ids): |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
147 |
if contains_whitespace(parent_id): |
148 |
raise ValueError(parent_id) |
|
7045.2.11
by Jelmer Vernooij
Fix some testament tests. |
149 |
a(' %s\n' % parent_id.decode('utf-8')) |
1185.16.22
by Martin Pool
- more testament development |
150 |
a('message:\n') |
1185.16.15
by Martin Pool
- test text form for testaments |
151 |
for l in self.message.splitlines(): |
1185.16.22
by Martin Pool
- more testament development |
152 |
a(' %s\n' % l) |
153 |
a('inventory:\n') |
|
1910.2.54
by Aaron Bentley
Implement testament format 3 strict |
154 |
for path, ie in self._get_entries(): |
1185.16.22
by Martin Pool
- more testament development |
155 |
a(self._entry_to_line(path, ie)) |
1185.16.59
by mbp at sourcefrog
- store revprops in testaments |
156 |
r.extend(self._revprops_to_lines()) |
1553.3.1
by Marien Zwart
Make Testament.as_text_lines return utf-8 instead of unicode objects and add a test for this. |
157 |
return [line.encode('utf-8') for line in r] |
1185.16.22
by Martin Pool
- more testament development |
158 |
|
1910.2.54
by Aaron Bentley
Implement testament format 3 strict |
159 |
def _get_entries(self): |
5798.1.1
by Jelmer Vernooij
Make Testament take a tree rather than a inventory. |
160 |
return ((path, ie) for (path, versioned, kind, file_id, ie) in |
161 |
self.tree.list_files(include_root=self.include_root)) |
|
1910.2.54
by Aaron Bentley
Implement testament format 3 strict |
162 |
|
1185.16.22
by Martin Pool
- more testament development |
163 |
def _escape_path(self, path): |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
164 |
if contains_linebreaks(path): |
165 |
raise ValueError(path) |
|
6973.6.4
by Jelmer Vernooij
Avoid text_type() |
166 |
if not isinstance(path, text_type): |
6996
by Jelmer Vernooij
Merge lp:~jelmer/brz/python3-e |
167 |
# TODO(jelmer): Clean this up for pad.lv/1696545
|
168 |
path = path.decode('ascii') |
|
6973.6.4
by Jelmer Vernooij
Avoid text_type() |
169 |
return path.replace(u'\\', u'/').replace(u' ', u'\\ ') |
1185.16.22
by Martin Pool
- more testament development |
170 |
|
171 |
def _entry_to_line(self, path, ie): |
|
172 |
"""Turn an inventory entry into a testament line""" |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
173 |
if contains_whitespace(ie.file_id): |
174 |
raise ValueError(ie.file_id) |
|
1930.2.2
by John Arbash Meinel
Avoid needless encode/decode. Only encode at the boundary (as suggested by hpk) |
175 |
content = '' |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
176 |
content_spacer = '' |
1185.16.22
by Martin Pool
- more testament development |
177 |
if ie.kind == 'file': |
178 |
# TODO: avoid switching on kind
|
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
179 |
if not ie.text_sha1: |
180 |
raise AssertionError() |
|
7045.2.11
by Jelmer Vernooij
Fix some testament tests. |
181 |
content = ie.text_sha1.decode('ascii') |
1930.2.2
by John Arbash Meinel
Avoid needless encode/decode. Only encode at the boundary (as suggested by hpk) |
182 |
content_spacer = ' ' |
1185.16.25
by Martin Pool
- testament symlink support |
183 |
elif ie.kind == 'symlink': |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
184 |
if not ie.symlink_target: |
185 |
raise AssertionError() |
|
1930.2.2
by John Arbash Meinel
Avoid needless encode/decode. Only encode at the boundary (as suggested by hpk) |
186 |
content = self._escape_path(ie.symlink_target) |
187 |
content_spacer = ' ' |
|
188 |
||
189 |
l = u' %s %s %s%s%s\n' % (ie.kind, self._escape_path(path), |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
190 |
ie.file_id.decode('utf8'), |
1930.2.2
by John Arbash Meinel
Avoid needless encode/decode. Only encode at the boundary (as suggested by hpk) |
191 |
content_spacer, content) |
192 |
return l |
|
1185.16.22
by Martin Pool
- more testament development |
193 |
|
194 |
def as_text(self): |
|
6973.7.8
by Jelmer Vernooij
Fix more tests. |
195 |
return b''.join(self.as_text_lines()) |
1185.16.15
by Martin Pool
- test text form for testaments |
196 |
|
1185.16.20
by Martin Pool
- add short-form of testaments |
197 |
def as_short_text(self): |
198 |
"""Return short digest-based testament.""" |
|
7045.1.20
by Jelmer Vernooij
Fix per_pack_repository tests. |
199 |
return (self.short_header.encode('ascii') + |
6973.7.8
by Jelmer Vernooij
Fix more tests. |
200 |
b'revision-id: %s\n' |
201 |
b'sha1: %s\n' |
|
1551.7.2
by Aaron Bentley
Testament sha1 is the same as in short form (John A. Meinel) |
202 |
% (self.revision_id, self.as_sha1())) |
1185.16.20
by Martin Pool
- add short-form of testaments |
203 |
|
1185.16.59
by mbp at sourcefrog
- store revprops in testaments |
204 |
def _revprops_to_lines(self): |
205 |
"""Pack up revision properties.""" |
|
206 |
if not self.revprops: |
|
207 |
return [] |
|
208 |
r = ['properties:\n'] |
|
209 |
for name, value in sorted(self.revprops.items()): |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
210 |
if contains_whitespace(name): |
211 |
raise ValueError(name) |
|
1185.16.59
by mbp at sourcefrog
- store revprops in testaments |
212 |
r.append(' %s:\n' % name) |
213 |
for line in value.splitlines(): |
|
1930.2.2
by John Arbash Meinel
Avoid needless encode/decode. Only encode at the boundary (as suggested by hpk) |
214 |
r.append(u' %s\n' % line) |
1185.16.59
by mbp at sourcefrog
- store revprops in testaments |
215 |
return r |
1185.82.116
by Aaron Bentley
Introduce StrictTestament, get test failing for the right reasons |
216 |
|
1185.82.121
by Aaron Bentley
Move calculation of Testament sha1s to Testament |
217 |
def as_sha1(self): |
5849.1.2
by Jelmer Vernooij
Use osutils.sha_strings. |
218 |
return sha_strings(self.as_text_lines()) |
1185.82.121
by Aaron Bentley
Move calculation of Testament sha1s to Testament |
219 |
|
1185.82.116
by Aaron Bentley
Introduce StrictTestament, get test failing for the right reasons |
220 |
|
221 |
class StrictTestament(Testament): |
|
1910.2.54
by Aaron Bentley
Implement testament format 3 strict |
222 |
"""This testament format is for use as a checksum in bundle format 0.8""" |
1185.82.116
by Aaron Bentley
Introduce StrictTestament, get test failing for the right reasons |
223 |
|
1551.7.1
by Aaron Bentley
Implement --strict at commandline, fix up strict format |
224 |
long_header = 'bazaar-ng testament version 2.1\n' |
225 |
short_header = 'bazaar-ng testament short form 2.1\n' |
|
5798.1.1
by Jelmer Vernooij
Make Testament take a tree rather than a inventory. |
226 |
include_root = False |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
227 |
|
1185.82.116
by Aaron Bentley
Introduce StrictTestament, get test failing for the right reasons |
228 |
def _entry_to_line(self, path, ie): |
1551.7.1
by Aaron Bentley
Implement --strict at commandline, fix up strict format |
229 |
l = Testament._entry_to_line(self, path, ie)[:-1] |
7045.2.11
by Jelmer Vernooij
Fix some testament tests. |
230 |
l += ' ' + ie.revision.decode('utf-8') |
1551.7.1
by Aaron Bentley
Implement --strict at commandline, fix up strict format |
231 |
l += {True: ' yes\n', False: ' no\n'}[ie.executable] |
1185.82.116
by Aaron Bentley
Introduce StrictTestament, get test failing for the right reasons |
232 |
return l |
1910.2.54
by Aaron Bentley
Implement testament format 3 strict |
233 |
|
1910.2.55
by Aaron Bentley
Bundle 0.9 uses Testament 3 strict |
234 |
|
1910.2.64
by Aaron Bentley
Changes from review |
235 |
class StrictTestament3(StrictTestament): |
1910.2.54
by Aaron Bentley
Implement testament format 3 strict |
236 |
"""This testament format is for use as a checksum in bundle format 0.9+ |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
237 |
|
1910.2.54
by Aaron Bentley
Implement testament format 3 strict |
238 |
It differs from StrictTestament by including data about the tree root.
|
239 |
"""
|
|
240 |
||
1910.2.64
by Aaron Bentley
Changes from review |
241 |
long_header = 'bazaar testament version 3 strict\n' |
242 |
short_header = 'bazaar testament short form 3 strict\n' |
|
5798.1.1
by Jelmer Vernooij
Make Testament take a tree rather than a inventory. |
243 |
include_root = True |
1910.2.54
by Aaron Bentley
Implement testament format 3 strict |
244 |
|
245 |
def _escape_path(self, path): |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
246 |
if contains_linebreaks(path): |
247 |
raise ValueError(path) |
|
6973.6.4
by Jelmer Vernooij
Avoid text_type() |
248 |
if not isinstance(path, text_type): |
249 |
# TODO(jelmer): Clean this up for pad.lv/1696545
|
|
250 |
path = path.decode('ascii') |
|
251 |
if path == u'': |
|
252 |
path = u'.' |
|
253 |
return path.replace(u'\\', u'/').replace(u' ', u'\\ ') |