184
by mbp at sourcefrog
pychecker fixups |
1 |
# (C) 2005 Canonical
|
1
by mbp at sourcefrog
import from baz patch-364 |
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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
||
1037
by Martin Pool
- fix up imports |
18 |
import bzrlib.errors |
1
by mbp at sourcefrog
import from baz patch-364 |
19 |
|
8
by mbp at sourcefrog
store committer's timezone in revision and show |
20 |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
21 |
class RevisionReference(object): |
696
by Martin Pool
- Refactor revision deserialization code |
22 |
"""
|
23 |
Reference to a stored revision.
|
|
24 |
||
25 |
Includes the revision_id and revision_sha1.
|
|
26 |
"""
|
|
27 |
revision_id = None |
|
28 |
revision_sha1 = None |
|
816
by Martin Pool
- don't write precursor field in new revision xml |
29 |
def __init__(self, revision_id, revision_sha1=None): |
696
by Martin Pool
- Refactor revision deserialization code |
30 |
if revision_id == None \ |
31 |
or isinstance(revision_id, basestring): |
|
32 |
self.revision_id = revision_id |
|
33 |
else: |
|
34 |
raise ValueError('bad revision_id %r' % revision_id) |
|
35 |
||
36 |
if revision_sha1 != None: |
|
37 |
if isinstance(revision_sha1, basestring) \ |
|
38 |
and len(revision_sha1) == 40: |
|
39 |
self.revision_sha1 = revision_sha1 |
|
40 |
else: |
|
41 |
raise ValueError('bad revision_sha1 %r' % revision_sha1) |
|
42 |
||
43 |
||
44 |
||
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
45 |
class Revision(object): |
1
by mbp at sourcefrog
import from baz patch-364 |
46 |
"""Single revision on a branch.
|
47 |
||
48 |
Revisions may know their revision_hash, but only once they've been
|
|
49 |
written out. This is not stored because you cannot write the hash
|
|
50 |
into the file it describes.
|
|
51 |
||
697
by Martin Pool
- write out parent list for new revisions |
52 |
After bzr 0.0.5 revisions are allowed to have multiple parents.
|
696
by Martin Pool
- Refactor revision deserialization code |
53 |
|
54 |
parents
|
|
700
by Martin Pool
doc |
55 |
List of parent revisions, each is a RevisionReference.
|
1
by mbp at sourcefrog
import from baz patch-364 |
56 |
"""
|
696
by Martin Pool
- Refactor revision deserialization code |
57 |
inventory_id = None |
58 |
inventory_sha1 = None |
|
59 |
revision_id = None |
|
60 |
timestamp = None |
|
61 |
message = None |
|
62 |
timezone = None |
|
63 |
committer = None |
|
64 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
65 |
def __init__(self, **args): |
66 |
self.__dict__.update(args) |
|
696
by Martin Pool
- Refactor revision deserialization code |
67 |
self.parents = [] |
68 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
69 |
|
70 |
def __repr__(self): |
|
184
by mbp at sourcefrog
pychecker fixups |
71 |
return "<Revision id %s>" % self.revision_id |
1
by mbp at sourcefrog
import from baz patch-364 |
72 |
|
73 |
||
74 |
def to_element(self): |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
75 |
from bzrlib.xml import Element, SubElement |
76 |
||
11
by mbp at sourcefrog
- change revision XML to <revision> |
77 |
root = Element('revision', |
1
by mbp at sourcefrog
import from baz patch-364 |
78 |
committer = self.committer, |
8
by mbp at sourcefrog
store committer's timezone in revision and show |
79 |
timestamp = '%.9f' % self.timestamp, |
1
by mbp at sourcefrog
import from baz patch-364 |
80 |
revision_id = self.revision_id, |
8
by mbp at sourcefrog
store committer's timezone in revision and show |
81 |
inventory_id = self.inventory_id, |
672
by Martin Pool
- revision records include the hash of their inventory and |
82 |
inventory_sha1 = self.inventory_sha1, |
673
by Martin Pool
- cope when writing out revisions with no timezone recorded |
83 |
)
|
84 |
if self.timezone: |
|
85 |
root.set('timezone', str(self.timezone)) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
86 |
root.text = '\n' |
87 |
||
88 |
msg = SubElement(root, 'message') |
|
89 |
msg.text = self.message |
|
90 |
msg.tail = '\n' |
|
91 |
||
697
by Martin Pool
- write out parent list for new revisions |
92 |
if self.parents: |
93 |
pelts = SubElement(root, 'parents') |
|
704
by Martin Pool
- more whitespace in XML for Revision |
94 |
pelts.tail = pelts.text = '\n' |
697
by Martin Pool
- write out parent list for new revisions |
95 |
for rr in self.parents: |
96 |
assert isinstance(rr, RevisionReference) |
|
97 |
p = SubElement(pelts, 'revision_ref') |
|
704
by Martin Pool
- more whitespace in XML for Revision |
98 |
p.tail = '\n' |
718
by Martin Pool
- add consistency checks when writing out revision |
99 |
assert rr.revision_id |
697
by Martin Pool
- write out parent list for new revisions |
100 |
p.set('revision_id', rr.revision_id) |
101 |
if rr.revision_sha1: |
|
102 |
p.set('revision_sha1', rr.revision_sha1) |
|
103 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
104 |
return root |
105 |
||
11
by mbp at sourcefrog
- change revision XML to <revision> |
106 |
|
107 |
def from_element(cls, elt): |
|
696
by Martin Pool
- Refactor revision deserialization code |
108 |
return unpack_revision(elt) |
1
by mbp at sourcefrog
import from baz patch-364 |
109 |
|
110 |
from_element = classmethod(from_element) |
|
111 |
||
696
by Martin Pool
- Refactor revision deserialization code |
112 |
|
113 |
||
114 |
def unpack_revision(elt): |
|
115 |
"""Convert XML element into Revision object."""
|
|
116 |
# <changeset> is deprecated...
|
|
117 |
if elt.tag not in ('revision', 'changeset'): |
|
1037
by Martin Pool
- fix up imports |
118 |
raise bzrlib.errors.BzrError("unexpected tag in revision file: %r" % elt) |
696
by Martin Pool
- Refactor revision deserialization code |
119 |
|
120 |
rev = Revision(committer = elt.get('committer'), |
|
121 |
timestamp = float(elt.get('timestamp')), |
|
122 |
revision_id = elt.get('revision_id'), |
|
123 |
inventory_id = elt.get('inventory_id'), |
|
124 |
inventory_sha1 = elt.get('inventory_sha1') |
|
125 |
)
|
|
126 |
||
127 |
precursor = elt.get('precursor') |
|
128 |
precursor_sha1 = elt.get('precursor_sha1') |
|
129 |
||
130 |
pelts = elt.find('parents') |
|
131 |
||
816
by Martin Pool
- don't write precursor field in new revision xml |
132 |
if pelts: |
696
by Martin Pool
- Refactor revision deserialization code |
133 |
for p in pelts: |
697
by Martin Pool
- write out parent list for new revisions |
134 |
assert p.tag == 'revision_ref', \ |
696
by Martin Pool
- Refactor revision deserialization code |
135 |
"bad parent node tag %r" % p.tag |
136 |
rev_ref = RevisionReference(p.get('revision_id'), |
|
137 |
p.get('revision_sha1')) |
|
138 |
rev.parents.append(rev_ref) |
|
139 |
||
816
by Martin Pool
- don't write precursor field in new revision xml |
140 |
if precursor: |
141 |
# must be consistent
|
|
142 |
prec_parent = rev.parents[0].revision_id |
|
143 |
assert prec_parent == precursor |
|
144 |
elif precursor: |
|
145 |
# revisions written prior to 0.0.5 have a single precursor
|
|
146 |
# give as an attribute
|
|
147 |
rev_ref = RevisionReference(precursor, precursor_sha1) |
|
148 |
rev.parents.append(rev_ref) |
|
149 |
||
696
by Martin Pool
- Refactor revision deserialization code |
150 |
v = elt.get('timezone') |
151 |
rev.timezone = v and int(v) |
|
152 |
||
153 |
rev.message = elt.findtext('message') # text of <message> |
|
154 |
return rev |
|
810
by Martin Pool
- New validate_revision_id function |
155 |
|
156 |
||
157 |
||
158 |
REVISION_ID_RE = None |
|
159 |
||
160 |
def validate_revision_id(rid): |
|
161 |
"""Check rid is syntactically valid for a revision id."""
|
|
162 |
global REVISION_ID_RE |
|
163 |
if not REVISION_ID_RE: |
|
164 |
import re |
|
814
by Martin Pool
- allow doubled-dashes in revision ids |
165 |
REVISION_ID_RE = re.compile('[\w.-]+@[\w.-]+--?\d+--?[0-9a-f]+\Z') |
810
by Martin Pool
- New validate_revision_id function |
166 |
|
167 |
if not REVISION_ID_RE.match(rid): |
|
168 |
raise ValueError("malformed revision-id %r" % rid) |
|
1034
by Martin Pool
- merge bzrlib.revision.is_ancestor from aaron |
169 |
|
170 |
def is_ancestor(revision_id, candidate_id, revision_source): |
|
171 |
"""Return true if candidate_id is an ancestor of revision_id.
|
|
172 |
A false negative will be returned if any intermediate descendent of
|
|
173 |
candidate_id is not present in any of the revision_sources.
|
|
810
by Martin Pool
- New validate_revision_id function |
174 |
|
1034
by Martin Pool
- merge bzrlib.revision.is_ancestor from aaron |
175 |
revisions_source is an object supporting a get_revision operation that
|
176 |
behaves like Branch's.
|
|
177 |
"""
|
|
178 |
||
179 |
ancestors = (revision_id,) |
|
180 |
while len(ancestors) > 0: |
|
181 |
new_ancestors = [] |
|
182 |
for ancestor in ancestors: |
|
183 |
if ancestor == candidate_id: |
|
184 |
return True |
|
185 |
try: |
|
186 |
revision = revision_source.get_revision(ancestor) |
|
1043
by Martin Pool
- fix imported name |
187 |
except bzrlib.errors.NoSuchRevision, e: |
1034
by Martin Pool
- merge bzrlib.revision.is_ancestor from aaron |
188 |
if e.revision == revision_id: |
1046
by Martin Pool
- cleanup re-raise of exception |
189 |
raise
|
1034
by Martin Pool
- merge bzrlib.revision.is_ancestor from aaron |
190 |
else: |
191 |
continue
|
|
192 |
new_ancestors.extend([p.revision_id for p in revision.parents]) |
|
193 |
ancestors = new_ancestors |
|
194 |
||
195 |
||
196 |
class MultipleRevisionSources(object): |
|
197 |
def __init__(self, *args): |
|
198 |
object.__init__(self) |
|
199 |
assert len(args) != 0 |
|
200 |
self._revision_sources = args |
|
201 |
||
202 |
def get_revision(self, revision_id): |
|
203 |
for source in self._revision_sources: |
|
204 |
try: |
|
205 |
return source.get_revision(revision_id) |
|
1037
by Martin Pool
- fix up imports |
206 |
except bzrlib.errors.NoSuchRevision, e: |
1034
by Martin Pool
- merge bzrlib.revision.is_ancestor from aaron |
207 |
pass
|
208 |
raise e |