1
# Copyright (C) 2005, 2006 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
class RevisionReference(object):
23
Reference to a stored revision.
25
Includes the revision_id and revision_sha1.
29
def __init__(self, revision_id, revision_sha1=None):
30
if revision_id == None \
31
or isinstance(revision_id, basestring):
32
self.revision_id = revision_id
34
raise ValueError('bad revision_id %r' % revision_id)
36
if revision_sha1 != None:
37
if isinstance(revision_sha1, basestring) \
38
and len(revision_sha1) == 40:
39
self.revision_sha1 = revision_sha1
41
raise ValueError('bad revision_sha1 %r' % revision_sha1)
17
# TODO: Some kind of command-line display of revision properties:
18
# perhaps show them in log -v and allow them as options to the commit command.
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
from bzrlib import deprecated_graph
29
from bzrlib.osutils import contains_whitespace
30
from bzrlib.progress import DummyProgress
33
CURRENT_REVISION="current:"
45
36
class Revision(object):
52
43
After bzr 0.0.5 revisions are allowed to have multiple parents.
55
List of parent revisions, each is a RevisionReference.
46
List of parent revision_ids
49
Dictionary of revision properties. These are attached to the
50
revision as extra metadata. The name must be a single
51
word; the value can be an arbitrary string.
65
def __init__(self, **args):
54
def __init__(self, revision_id, properties=None, **args):
55
self.revision_id = revision_id
56
self.properties = properties or {}
57
self._check_properties()
59
self.parent_sha1s = []
60
"""Not used anymore - legacy from for 4."""
66
61
self.__dict__.update(args)
70
63
def __repr__(self):
71
64
return "<Revision id %s>" % self.revision_id
75
from bzrlib.xml import Element, SubElement
77
root = Element('revision',
78
committer = self.committer,
79
timestamp = '%.9f' % self.timestamp,
80
revision_id = self.revision_id,
81
inventory_id = self.inventory_id,
82
inventory_sha1 = self.inventory_sha1,
85
root.set('timezone', str(self.timezone))
88
msg = SubElement(root, 'message')
89
msg.text = self.message
93
pelts = SubElement(root, 'parents')
94
pelts.tail = pelts.text = '\n'
95
for rr in self.parents:
96
assert isinstance(rr, RevisionReference)
97
p = SubElement(pelts, 'revision_ref')
100
p.set('revision_id', rr.revision_id)
102
p.set('revision_sha1', rr.revision_sha1)
107
def from_element(cls, elt):
108
return unpack_revision(elt)
110
from_element = classmethod(from_element)
114
def unpack_revision(elt):
115
"""Convert XML element into Revision object."""
116
# <changeset> is deprecated...
117
if elt.tag not in ('revision', 'changeset'):
118
raise bzrlib.errors.BzrError("unexpected tag in revision file: %r" % elt)
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')
127
precursor = elt.get('precursor')
128
precursor_sha1 = elt.get('precursor_sha1')
130
pelts = elt.find('parents')
134
assert p.tag == 'revision_ref', \
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)
142
prec_parent = rev.parents[0].revision_id
143
assert prec_parent == 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)
150
v = elt.get('timezone')
151
rev.timezone = v and int(v)
153
rev.message = elt.findtext('message') # text of <message>
158
REVISION_ID_RE = None
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:
165
REVISION_ID_RE = re.compile('[\w.-]+@[\w.-]+--?\d+--?[0-9a-f]+\Z')
167
if not REVISION_ID_RE.match(rid):
168
raise ValueError("malformed revision-id %r" % rid)
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.
175
revisions_source is an object supporting a get_revision operation that
176
behaves like Branch's.
66
def __eq__(self, other):
67
if not isinstance(other, Revision):
69
# FIXME: rbc 20050930 parent_ids are not being compared
71
self.inventory_sha1 == other.inventory_sha1
72
and self.revision_id == other.revision_id
73
and self.timestamp == other.timestamp
74
and self.message == other.message
75
and self.timezone == other.timezone
76
and self.committer == other.committer
77
and self.properties == other.properties)
79
def __ne__(self, other):
80
return not self.__eq__(other)
82
def _check_properties(self):
83
"""Verify that all revision properties are OK."""
84
for name, value in self.properties.iteritems():
85
if not isinstance(name, basestring) or contains_whitespace(name):
86
raise ValueError("invalid property name %r" % name)
87
if not isinstance(value, basestring):
88
raise ValueError("invalid property value %r for %r" %
91
def get_history(self, repository):
92
"""Return the canonical line-of-history for this revision.
94
If ghosts are present this may differ in result from a ghost-free
97
current_revision = self
99
while current_revision is not None:
100
reversed_result.append(current_revision.revision_id)
101
if not len (current_revision.parent_ids):
102
reversed_result.append(None)
103
current_revision = None
105
next_revision_id = current_revision.parent_ids[0]
106
current_revision = repository.get_revision(next_revision_id)
107
reversed_result.reverse()
108
return reversed_result
110
def get_summary(self):
111
"""Get the first line of the log message for this revision.
113
return self.message.lstrip().split('\n', 1)[0]
115
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((1, 13, 0)))
116
def get_apparent_author(self):
117
"""Return the apparent author of this revision.
119
This method is deprecated in favour of get_apparent_authors.
121
If the revision properties contain any author names,
122
return the first. Otherwise return the committer name.
124
return self.get_apparent_authors()[0]
126
def get_apparent_authors(self):
127
"""Return the apparent authors of this revision.
129
If the revision properties contain the names of the authors,
130
return them. Otherwise return the committer name.
132
The return value will be a list containing at least one element.
134
authors = self.properties.get('authors', None)
136
author = self.properties.get('author', None)
138
return [self.committer]
141
return authors.split("\n")
144
def iter_ancestors(revision_id, revision_source, only_present=False):
179
145
ancestors = (revision_id,)
180
147
while len(ancestors) > 0:
181
148
new_ancestors = []
182
149
for ancestor in ancestors:
183
if ancestor == candidate_id:
151
yield ancestor, distance
186
153
revision = revision_source.get_revision(ancestor)
187
except bzrlib.errors.NoSuchRevision, e:
154
except errors.NoSuchRevision, e:
188
155
if e.revision == revision_id:
192
new_ancestors.extend([p.revision_id for p in revision.parents])
160
yield ancestor, distance
161
new_ancestors.extend(revision.parent_ids)
193
162
ancestors = new_ancestors
196
class MultipleRevisionSources(object):
197
def __init__(self, *args):
198
object.__init__(self)
199
assert len(args) != 0
200
self._revision_sources = args
202
def get_revision(self, revision_id):
203
for source in self._revision_sources:
205
return source.get_revision(revision_id)
206
except bzrlib.errors.NoSuchRevision, e:
166
def find_present_ancestors(revision_id, revision_source):
167
"""Return the ancestors of a revision present in a branch.
169
It's possible that a branch won't have the complete ancestry of
170
one of its revisions.
174
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
176
for anc_order, (anc_id, anc_distance) in anc_iter:
177
if anc_id not in found_ancestors:
178
found_ancestors[anc_id] = (anc_order, anc_distance)
179
return found_ancestors
182
def __get_closest(intersection):
185
for entry in intersection:
186
if entry[0] == intersection[0][0]:
187
matches.append(entry[2])
191
def is_reserved_id(revision_id):
192
"""Determine whether a revision id is reserved
194
:return: True if the revision is is reserved, False otherwise
196
return isinstance(revision_id, basestring) and revision_id.endswith(':')
199
def check_not_reserved_id(revision_id):
200
"""Raise ReservedId if the supplied revision_id is reserved"""
201
if is_reserved_id(revision_id):
202
raise errors.ReservedId(revision_id)
205
def ensure_null(revision_id):
206
"""Ensure only NULL_REVISION is used to represent the null revision"""
207
if revision_id is None:
208
symbol_versioning.warn('NULL_REVISION should be used for the null'
209
' revision instead of None, as of bzr 0.91.',
210
DeprecationWarning, stacklevel=2)
216
def is_null(revision_id):
217
if revision_id is None:
218
symbol_versioning.warn('NULL_REVISION should be used for the null'
219
' revision instead of None, as of bzr 0.90.',
220
DeprecationWarning, stacklevel=2)
221
return revision_id in (None, NULL_REVISION)
added
removed
bzrlib/revision.py
