~bzr-pqm/bzr/bzr.dev

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