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