~bzr-pqm/bzr/bzr.dev

5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2005-2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1 by mbp at sourcefrog
import from baz patch-364
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
1 by mbp at sourcefrog
import from baz patch-364
16
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
18
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
19
# TODO: Some kind of command-line display of revision properties:
1185.16.40 by Martin Pool
todo
20
# perhaps show them in log -v and allow them as options to the commit command.
1 by mbp at sourcefrog
import from baz patch-364
21
1590.1.1 by Robert Collins
Improve common_ancestor performance.
22
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
4119.4.3 by Jonathan Lange
Add Revision.iter_bugs.
25
from bzrlib import bugtracker
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
26
""")
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
27
from bzrlib import (
28
    errors,
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
29
    symbol_versioning,
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
30
    )
1185.16.39 by Martin Pool
- constraints on revprops
31
from bzrlib.osutils import contains_whitespace
8 by mbp at sourcefrog
store committer's timezone in revision and show
32
974.1.90 by Aaron Bentley
Switched NULL revision ID to 'null:' per robertc's suggestion
33
NULL_REVISION="null:"
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
34
CURRENT_REVISION="current:"
974.1.89 by Aaron Bentley
Fixed merging with multiple roots, by using null as graph root.
35
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
36
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
37
class Revision(object):
1 by mbp at sourcefrog
import from baz patch-364
38
    """Single revision on a branch.
39
40
    Revisions may know their revision_hash, but only once they've been
41
    written out.  This is not stored because you cannot write the hash
42
    into the file it describes.
43
697 by Martin Pool
- write out parent list for new revisions
44
    After bzr 0.0.5 revisions are allowed to have multiple parents.
696 by Martin Pool
- Refactor revision deserialization code
45
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
46
    parent_ids
47
        List of parent revision_ids
1185.16.39 by Martin Pool
- constraints on revprops
48
49
    properties
50
        Dictionary of revision properties.  These are attached to the
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
51
        revision as extra metadata.  The name must be a single
1185.16.39 by Martin Pool
- constraints on revprops
52
        word; the value can be an arbitrary string.
1 by mbp at sourcefrog
import from baz patch-364
53
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
54
1185.16.35 by Martin Pool
- stub for revision properties
55
    def __init__(self, revision_id, properties=None, **args):
1092.2.25 by Robert Collins
support ghosts in commits
56
        self.revision_id = revision_id
4379.4.1 by Ian Clatworthy
make log --long faster
57
        if properties is None:
58
            self.properties = {}
59
        else:
60
            self.properties = properties
61
            self._check_properties()
4258.3.1 by Jelmer Vernooij
Cope with revision.committer being None.
62
        self.committer = None
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
63
        self.parent_ids = []
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
64
        self.parent_sha1s = []
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
65
        """Not used anymore - legacy from for 4."""
1185.42.6 by Jelmer Vernooij
Don't clear Revision.parent_ids after it has been set from the arguments
66
        self.__dict__.update(args)
696 by Martin Pool
- Refactor revision deserialization code
67
1 by mbp at sourcefrog
import from baz patch-364
68
    def __repr__(self):
184 by mbp at sourcefrog
pychecker fixups
69
        return "<Revision id %s>" % self.revision_id
1 by mbp at sourcefrog
import from baz patch-364
70
1185 by Martin Pool
- add xml round-trip test for revisions
71
    def __eq__(self, other):
72
        if not isinstance(other, Revision):
73
            return False
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
74
        return (
75
                self.inventory_sha1 == other.inventory_sha1
1185 by Martin Pool
- add xml round-trip test for revisions
76
                and self.revision_id == other.revision_id
77
                and self.timestamp == other.timestamp
78
                and self.message == other.message
79
                and self.timezone == other.timezone
1185.16.35 by Martin Pool
- stub for revision properties
80
                and self.committer == other.committer
4462.1.1 by Andrew Bennetts
Compare .parent_ids in Revision.__eq__.
81
                and self.properties == other.properties
82
                and self.parent_ids == other.parent_ids)
1185 by Martin Pool
- add xml round-trip test for revisions
83
84
    def __ne__(self, other):
85
        return not self.__eq__(other)
86
1185.16.39 by Martin Pool
- constraints on revprops
87
    def _check_properties(self):
1732.3.2 by Matthieu Moy
merge
88
        """Verify that all revision properties are OK."""
1185.16.39 by Martin Pool
- constraints on revprops
89
        for name, value in self.properties.iteritems():
90
            if not isinstance(name, basestring) or contains_whitespace(name):
91
                raise ValueError("invalid property name %r" % name)
92
            if not isinstance(value, basestring):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
93
                raise ValueError("invalid property value %r for %r" %
4634.24.1 by Ian Clatworthy
fix error message when illegal revision property value found
94
                                 (value, name))
1185.16.39 by Martin Pool
- constraints on revprops
95
1534.4.49 by Robert Collins
Provide a revision.get_history(repository) method for generating a synthetic revision history.
96
    def get_history(self, repository):
97
        """Return the canonical line-of-history for this revision.
98
99
        If ghosts are present this may differ in result from a ghost-free
100
        repository.
101
        """
102
        current_revision = self
103
        reversed_result = []
104
        while current_revision is not None:
105
            reversed_result.append(current_revision.revision_id)
106
            if not len (current_revision.parent_ids):
107
                reversed_result.append(None)
108
                current_revision = None
109
            else:
110
                next_revision_id = current_revision.parent_ids[0]
111
                current_revision = repository.get_revision(next_revision_id)
112
        reversed_result.reverse()
113
        return reversed_result
114
1740.2.5 by Aaron Bentley
Merge from bzr.dev
115
    def get_summary(self):
116
        """Get the first line of the log message for this revision.
4398.10.1 by jszakmeister
Make Revision.get_summary() return an empty string when Revision.message is None, instead of backtracing.
117
118
        Return an empty string if message is None.
1740.2.5 by Aaron Bentley
Merge from bzr.dev
119
        """
4398.10.1 by jszakmeister
Make Revision.get_summary() return an empty string when Revision.message is None, instead of backtracing.
120
        if self.message:
121
            return self.message.lstrip().split('\n', 1)[0]
122
        else:
123
            return ''
1740.2.5 by Aaron Bentley
Merge from bzr.dev
124
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
125
    def get_apparent_authors(self):
126
        """Return the apparent authors of this revision.
127
128
        If the revision properties contain the names of the authors,
129
        return them. Otherwise return the committer name.
130
131
        The return value will be a list containing at least one element.
132
        """
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
133
        authors = self.properties.get('authors', None)
134
        if authors is None:
4258.3.1 by Jelmer Vernooij
Cope with revision.committer being None.
135
            author = self.properties.get('author', self.committer)
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
136
            if author is None:
4258.3.1 by Jelmer Vernooij
Cope with revision.committer being None.
137
                return []
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
138
            return [author]
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
139
        else:
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
140
            return authors.split("\n")
2671.5.2 by Lukáš Lalinsky
Add Revision.get_author to return the author's name, either from the property 'author' or the name of the committer.
141
4119.4.3 by Jonathan Lange
Add Revision.iter_bugs.
142
    def iter_bugs(self):
143
        """Iterate over the bugs associated with this revision."""
144
        bug_property = self.properties.get('bugs', None)
145
        if bug_property is None:
146
            return
147
        for line in bug_property.splitlines():
148
            try:
149
                url, status = line.split(None, 2)
150
            except ValueError:
151
                raise errors.InvalidLineInBugsProperty(line)
152
            if status not in bugtracker.ALLOWED_BUG_STATUSES:
153
                raise errors.InvalidBugStatus(status)
154
            yield url, status
155
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
156
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
157
def iter_ancestors(revision_id, revision_source, only_present=False):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
158
    ancestors = (revision_id,)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
159
    distance = 0
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
160
    while len(ancestors) > 0:
161
        new_ancestors = []
162
        for ancestor in ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
163
            if not only_present:
164
                yield ancestor, distance
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
165
            try:
166
                revision = revision_source.get_revision(ancestor)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
167
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
168
                if e.revision == revision_id:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
169
                    raise
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
170
                else:
171
                    continue
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
172
            if only_present:
173
                yield ancestor, distance
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
174
            new_ancestors.extend(revision.parent_ids)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
175
        ancestors = new_ancestors
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
176
        distance += 1
177
178
179
def find_present_ancestors(revision_id, revision_source):
1133 by Martin Pool
doc
180
    """Return the ancestors of a revision present in a branch.
181
182
    It's possible that a branch won't have the complete ancestry of
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
183
    one of its revisions.
1133 by Martin Pool
doc
184
185
    """
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
186
    found_ancestors = {}
187
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
188
                         only_present=True))
189
    for anc_order, (anc_id, anc_distance) in anc_iter:
1963.2.1 by Robey Pointer
remove usage of has_key()
190
        if anc_id not in found_ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
191
            found_ancestors[anc_id] = (anc_order, anc_distance)
192
    return found_ancestors
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
193
1153 by Martin Pool
- clean up some code in revision.py
194
195
def __get_closest(intersection):
196
    intersection.sort()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
197
    matches = []
1153 by Martin Pool
- clean up some code in revision.py
198
    for entry in intersection:
199
        if entry[0] == intersection[0][0]:
200
            matches.append(entry[2])
201
    return matches
202
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
203
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
204
def is_reserved_id(revision_id):
2229.2.2 by Aaron Bentley
Update docs
205
    """Determine whether a revision id is reserved
206
4031.3.1 by Frank Aspell
Fixing various typos
207
    :return: True if the revision is reserved, False otherwise
2229.2.2 by Aaron Bentley
Update docs
208
    """
209
    return isinstance(revision_id, basestring) and revision_id.endswith(':')
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
210
211
212
def check_not_reserved_id(revision_id):
213
    """Raise ReservedId if the supplied revision_id is reserved"""
214
    if is_reserved_id(revision_id):
215
        raise errors.ReservedId(revision_id)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
216
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
217
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
218
def ensure_null(revision_id):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
219
    """Ensure only NULL_REVISION is used to represent the null revision"""
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
220
    if revision_id is None:
2598.5.16 by Aaron Bentley
Replace exception with deprecation warning
221
        symbol_versioning.warn('NULL_REVISION should be used for the null'
222
            ' revision instead of None, as of bzr 0.91.',
223
            DeprecationWarning, stacklevel=2)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
224
        return NULL_REVISION
225
    else:
226
        return revision_id
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
227
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
228
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
229
def is_null(revision_id):
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
230
    if revision_id is None:
231
        symbol_versioning.warn('NULL_REVISION should be used for the null'
2687.2.2 by Martin Pool
Fix up other references to 0.19
232
            ' revision instead of None, as of bzr 0.90.',
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
233
            DeprecationWarning, stacklevel=2)
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
234
    return revision_id in (None, NULL_REVISION)