~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
1185.16.40 by Martin Pool
todo
17
# TODO: Some kind of command-line display of revision properties: 
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
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
1534.9.1 by Aaron Bentley
Added progress bars to merge
30
from bzrlib.progress import DummyProgress
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
50
        revision as extra metadata.  The name must be a single 
51
        word; the value can be an arbitrary string.
1 by mbp at sourcefrog
import from baz patch-364
52
    """
696 by Martin Pool
- Refactor revision deserialization code
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
1185.16.35 by Martin Pool
- stub for revision properties
56
        self.properties = properties or {}
1185.16.39 by Martin Pool
- constraints on revprops
57
        self._check_properties()
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
58
        self.parent_ids = []
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
59
        self.parent_sha1s = []
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
60
        """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
61
        self.__dict__.update(args)
696 by Martin Pool
- Refactor revision deserialization code
62
1 by mbp at sourcefrog
import from baz patch-364
63
    def __repr__(self):
184 by mbp at sourcefrog
pychecker fixups
64
        return "<Revision id %s>" % self.revision_id
1 by mbp at sourcefrog
import from baz patch-364
65
1185 by Martin Pool
- add xml round-trip test for revisions
66
    def __eq__(self, other):
67
        if not isinstance(other, Revision):
68
            return False
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
69
        # FIXME: rbc 20050930 parent_ids are not being compared
70
        return (
71
                self.inventory_sha1 == other.inventory_sha1
1185 by Martin Pool
- add xml round-trip test for revisions
72
                and self.revision_id == other.revision_id
73
                and self.timestamp == other.timestamp
74
                and self.message == other.message
75
                and self.timezone == other.timezone
1185.16.35 by Martin Pool
- stub for revision properties
76
                and self.committer == other.committer
77
                and self.properties == other.properties)
1185 by Martin Pool
- add xml round-trip test for revisions
78
79
    def __ne__(self, other):
80
        return not self.__eq__(other)
81
1185.16.39 by Martin Pool
- constraints on revprops
82
    def _check_properties(self):
1732.3.2 by Matthieu Moy
merge
83
        """Verify that all revision properties are OK."""
1185.16.39 by Martin Pool
- constraints on revprops
84
        for name, value in self.properties.iteritems():
85
            if not isinstance(name, basestring) or contains_whitespace(name):
86
                raise ValueError("invalid property name %r" % name)
87
            if not isinstance(value, basestring):
88
                raise ValueError("invalid property value %r for %r" % 
89
                                 (name, value))
90
1534.4.49 by Robert Collins
Provide a revision.get_history(repository) method for generating a synthetic revision history.
91
    def get_history(self, repository):
92
        """Return the canonical line-of-history for this revision.
93
94
        If ghosts are present this may differ in result from a ghost-free
95
        repository.
96
        """
97
        current_revision = self
98
        reversed_result = []
99
        while current_revision is not None:
100
            reversed_result.append(current_revision.revision_id)
101
            if not len (current_revision.parent_ids):
102
                reversed_result.append(None)
103
                current_revision = None
104
            else:
105
                next_revision_id = current_revision.parent_ids[0]
106
                current_revision = repository.get_revision(next_revision_id)
107
        reversed_result.reverse()
108
        return reversed_result
109
1740.2.5 by Aaron Bentley
Merge from bzr.dev
110
    def get_summary(self):
111
        """Get the first line of the log message for this revision.
112
        """
2671.5.1 by Lukáš Lalinsky
Strip leading whitespace from the commit message before using the first line as a commit summary.
113
        return self.message.lstrip().split('\n', 1)[0]
1740.2.5 by Aaron Bentley
Merge from bzr.dev
114
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
115
    def get_apparent_author(self):
116
        """Return the apparent author of this revision.
117
118
        If the revision properties contain the author name,
119
        return it. Otherwise return the committer name.
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.
120
        """
121
        return self.properties.get('author', self.committer)
122
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
123
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
124
def iter_ancestors(revision_id, revision_source, only_present=False):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
125
    ancestors = (revision_id,)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
126
    distance = 0
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
127
    while len(ancestors) > 0:
128
        new_ancestors = []
129
        for ancestor in ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
130
            if not only_present:
131
                yield ancestor, distance
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
132
            try:
133
                revision = revision_source.get_revision(ancestor)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
134
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
135
                if e.revision == revision_id:
136
                    raise 
137
                else:
138
                    continue
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
139
            if only_present:
140
                yield ancestor, distance
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
141
            new_ancestors.extend(revision.parent_ids)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
142
        ancestors = new_ancestors
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
143
        distance += 1
144
145
146
def find_present_ancestors(revision_id, revision_source):
1133 by Martin Pool
doc
147
    """Return the ancestors of a revision present in a branch.
148
149
    It's possible that a branch won't have the complete ancestry of
150
    one of its revisions.  
151
152
    """
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
153
    found_ancestors = {}
154
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
155
                         only_present=True))
156
    for anc_order, (anc_id, anc_distance) in anc_iter:
1963.2.1 by Robey Pointer
remove usage of has_key()
157
        if anc_id not in found_ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
158
            found_ancestors[anc_id] = (anc_order, anc_distance)
159
    return found_ancestors
160
    
1153 by Martin Pool
- clean up some code in revision.py
161
162
def __get_closest(intersection):
163
    intersection.sort()
164
    matches = [] 
165
    for entry in intersection:
166
        if entry[0] == intersection[0][0]:
167
            matches.append(entry[2])
168
    return matches
169
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
170
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
171
def is_reserved_id(revision_id):
2229.2.2 by Aaron Bentley
Update docs
172
    """Determine whether a revision id is reserved
173
174
    :return: True if the revision is is reserved, False otherwise
175
    """
176
    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
177
178
179
def check_not_reserved_id(revision_id):
180
    """Raise ReservedId if the supplied revision_id is reserved"""
181
    if is_reserved_id(revision_id):
182
        raise errors.ReservedId(revision_id)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
183
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
184
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
185
def ensure_null(revision_id):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
186
    """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
187
    if revision_id is None:
2598.5.16 by Aaron Bentley
Replace exception with deprecation warning
188
        symbol_versioning.warn('NULL_REVISION should be used for the null'
189
            ' revision instead of None, as of bzr 0.91.',
190
            DeprecationWarning, stacklevel=2)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
191
        return NULL_REVISION
192
    else:
193
        return revision_id
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
194
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
195
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
196
def is_null(revision_id):
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
197
    if revision_id is None:
198
        symbol_versioning.warn('NULL_REVISION should be used for the null'
2687.2.2 by Martin Pool
Fix up other references to 0.19
199
            ' revision instead of None, as of bzr 0.90.',
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
200
            DeprecationWarning, stacklevel=2)
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
201
    return revision_id in (None, NULL_REVISION)