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