~bzr-pqm/bzr/bzr.dev

2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
1
# Copyright (C) 2005, 2006 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
1534.9.1 by Aaron Bentley
Added progress bars to merge
31
from bzrlib.progress import DummyProgress
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
1185.16.35 by Martin Pool
- stub for revision properties
57
        self.properties = properties or {}
1185.16.39 by Martin Pool
- constraints on revprops
58
        self._check_properties()
4258.3.1 by Jelmer Vernooij
Cope with revision.committer being None.
59
        self.committer = None
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
60
        self.parent_ids = []
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
61
        self.parent_sha1s = []
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
62
        """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
63
        self.__dict__.update(args)
696 by Martin Pool
- Refactor revision deserialization code
64
1 by mbp at sourcefrog
import from baz patch-364
65
    def __repr__(self):
184 by mbp at sourcefrog
pychecker fixups
66
        return "<Revision id %s>" % self.revision_id
1 by mbp at sourcefrog
import from baz patch-364
67
1185 by Martin Pool
- add xml round-trip test for revisions
68
    def __eq__(self, other):
69
        if not isinstance(other, Revision):
70
            return False
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
71
        return (
72
                self.inventory_sha1 == other.inventory_sha1
1185 by Martin Pool
- add xml round-trip test for revisions
73
                and self.revision_id == other.revision_id
74
                and self.timestamp == other.timestamp
75
                and self.message == other.message
76
                and self.timezone == other.timezone
1185.16.35 by Martin Pool
- stub for revision properties
77
                and self.committer == other.committer
4462.1.1 by Andrew Bennetts
Compare .parent_ids in Revision.__eq__.
78
                and self.properties == other.properties
79
                and self.parent_ids == other.parent_ids)
1185 by Martin Pool
- add xml round-trip test for revisions
80
81
    def __ne__(self, other):
82
        return not self.__eq__(other)
83
1185.16.39 by Martin Pool
- constraints on revprops
84
    def _check_properties(self):
1732.3.2 by Matthieu Moy
merge
85
        """Verify that all revision properties are OK."""
1185.16.39 by Martin Pool
- constraints on revprops
86
        for name, value in self.properties.iteritems():
87
            if not isinstance(name, basestring) or contains_whitespace(name):
88
                raise ValueError("invalid property name %r" % name)
89
            if not isinstance(value, basestring):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
90
                raise ValueError("invalid property value %r for %r" %
4634.24.1 by Ian Clatworthy
fix error message when illegal revision property value found
91
                                 (value, name))
1185.16.39 by Martin Pool
- constraints on revprops
92
1534.4.49 by Robert Collins
Provide a revision.get_history(repository) method for generating a synthetic revision history.
93
    def get_history(self, repository):
94
        """Return the canonical line-of-history for this revision.
95
96
        If ghosts are present this may differ in result from a ghost-free
97
        repository.
98
        """
99
        current_revision = self
100
        reversed_result = []
101
        while current_revision is not None:
102
            reversed_result.append(current_revision.revision_id)
103
            if not len (current_revision.parent_ids):
104
                reversed_result.append(None)
105
                current_revision = None
106
            else:
107
                next_revision_id = current_revision.parent_ids[0]
108
                current_revision = repository.get_revision(next_revision_id)
109
        reversed_result.reverse()
110
        return reversed_result
111
1740.2.5 by Aaron Bentley
Merge from bzr.dev
112
    def get_summary(self):
113
        """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.
114
115
        Return an empty string if message is None.
1740.2.5 by Aaron Bentley
Merge from bzr.dev
116
        """
4398.10.1 by jszakmeister
Make Revision.get_summary() return an empty string when Revision.message is None, instead of backtracing.
117
        if self.message:
118
            return self.message.lstrip().split('\n', 1)[0]
119
        else:
120
            return ''
1740.2.5 by Aaron Bentley
Merge from bzr.dev
121
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
122
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((1, 13, 0)))
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
123
    def get_apparent_author(self):
124
        """Return the apparent author of this revision.
125
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
126
        This method is deprecated in favour of get_apparent_authors.
127
128
        If the revision properties contain any author names,
129
        return the first. Otherwise return the committer name.
130
        """
4258.3.1 by Jelmer Vernooij
Cope with revision.committer being None.
131
        authors = self.get_apparent_authors()
132
        if authors:
133
            return authors[0]
134
        else:
135
            return None
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
136
137
    def get_apparent_authors(self):
138
        """Return the apparent authors of this revision.
139
140
        If the revision properties contain the names of the authors,
141
        return them. Otherwise return the committer name.
142
143
        The return value will be a list containing at least one element.
144
        """
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
145
        authors = self.properties.get('authors', None)
146
        if authors is None:
4258.3.1 by Jelmer Vernooij
Cope with revision.committer being None.
147
            author = self.properties.get('author', self.committer)
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
148
            if author is None:
4258.3.1 by Jelmer Vernooij
Cope with revision.committer being None.
149
                return []
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
150
            return [author]
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
151
        else:
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
152
            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.
153
4119.4.3 by Jonathan Lange
Add Revision.iter_bugs.
154
    def iter_bugs(self):
155
        """Iterate over the bugs associated with this revision."""
156
        bug_property = self.properties.get('bugs', None)
157
        if bug_property is None:
158
            return
159
        for line in bug_property.splitlines():
160
            try:
161
                url, status = line.split(None, 2)
162
            except ValueError:
163
                raise errors.InvalidLineInBugsProperty(line)
164
            if status not in bugtracker.ALLOWED_BUG_STATUSES:
165
                raise errors.InvalidBugStatus(status)
166
            yield url, status
167
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
168
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
169
def iter_ancestors(revision_id, revision_source, only_present=False):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
170
    ancestors = (revision_id,)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
171
    distance = 0
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
172
    while len(ancestors) > 0:
173
        new_ancestors = []
174
        for ancestor in ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
175
            if not only_present:
176
                yield ancestor, distance
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
177
            try:
178
                revision = revision_source.get_revision(ancestor)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
179
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
180
                if e.revision == revision_id:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
181
                    raise
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
182
                else:
183
                    continue
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
184
            if only_present:
185
                yield ancestor, distance
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
186
            new_ancestors.extend(revision.parent_ids)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
187
        ancestors = new_ancestors
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
188
        distance += 1
189
190
191
def find_present_ancestors(revision_id, revision_source):
1133 by Martin Pool
doc
192
    """Return the ancestors of a revision present in a branch.
193
194
    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
195
    one of its revisions.
1133 by Martin Pool
doc
196
197
    """
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
198
    found_ancestors = {}
199
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
200
                         only_present=True))
201
    for anc_order, (anc_id, anc_distance) in anc_iter:
1963.2.1 by Robey Pointer
remove usage of has_key()
202
        if anc_id not in found_ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
203
            found_ancestors[anc_id] = (anc_order, anc_distance)
204
    return found_ancestors
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
205
1153 by Martin Pool
- clean up some code in revision.py
206
207
def __get_closest(intersection):
208
    intersection.sort()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
209
    matches = []
1153 by Martin Pool
- clean up some code in revision.py
210
    for entry in intersection:
211
        if entry[0] == intersection[0][0]:
212
            matches.append(entry[2])
213
    return matches
214
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
215
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
216
def is_reserved_id(revision_id):
2229.2.2 by Aaron Bentley
Update docs
217
    """Determine whether a revision id is reserved
218
4031.3.1 by Frank Aspell
Fixing various typos
219
    :return: True if the revision is reserved, False otherwise
2229.2.2 by Aaron Bentley
Update docs
220
    """
221
    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
222
223
224
def check_not_reserved_id(revision_id):
225
    """Raise ReservedId if the supplied revision_id is reserved"""
226
    if is_reserved_id(revision_id):
227
        raise errors.ReservedId(revision_id)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
228
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
229
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
230
def ensure_null(revision_id):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
231
    """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
232
    if revision_id is None:
2598.5.16 by Aaron Bentley
Replace exception with deprecation warning
233
        symbol_versioning.warn('NULL_REVISION should be used for the null'
234
            ' revision instead of None, as of bzr 0.91.',
235
            DeprecationWarning, stacklevel=2)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
236
        return NULL_REVISION
237
    else:
238
        return revision_id
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
239
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
240
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
241
def is_null(revision_id):
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
242
    if revision_id is None:
243
        symbol_versioning.warn('NULL_REVISION should be used for the null'
2687.2.2 by Martin Pool
Fix up other references to 0.19
244
            ' revision instead of None, as of bzr 0.90.',
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
245
            DeprecationWarning, stacklevel=2)
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
246
    return revision_id in (None, NULL_REVISION)