← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revision.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
28
28
    symbol_versioning,
29
29
    )
30
30
from bzrlib.osutils import contains_whitespace
31
 
from bzrlib.progress import DummyProgress
32
31
 
33
32
NULL_REVISION="null:"
34
33
CURRENT_REVISION="current:"
54
53
 
55
54
    def __init__(self, revision_id, properties=None, **args):
56
55
        self.revision_id = revision_id
57
 
        self.properties = properties or {}
58
 
        self._check_properties()
 
56
        if properties is None:
 
57
            self.properties = {}
 
58
        else:
 
59
            self.properties = properties
 
60
            self._check_properties()
 
61
        self.committer = None
59
62
        self.parent_ids = []
60
63
        self.parent_sha1s = []
61
64
        """Not used anymore - legacy from for 4."""
67
70
    def __eq__(self, other):
68
71
        if not isinstance(other, Revision):
69
72
            return False
70
 
        # FIXME: rbc 20050930 parent_ids are not being compared
71
73
        return (
72
74
                self.inventory_sha1 == other.inventory_sha1
73
75
                and self.revision_id == other.revision_id
75
77
                and self.message == other.message
76
78
                and self.timezone == other.timezone
77
79
                and self.committer == other.committer
78
 
                and self.properties == other.properties)
 
80
                and self.properties == other.properties
 
81
                and self.parent_ids == other.parent_ids)
79
82
 
80
83
    def __ne__(self, other):
81
84
        return not self.__eq__(other)
87
90
                raise ValueError("invalid property name %r" % name)
88
91
            if not isinstance(value, basestring):
89
92
                raise ValueError("invalid property value %r for %r" %
90
 
                                 (name, value))
 
93
                                 (value, name))
91
94
 
92
95
    def get_history(self, repository):
93
96
        """Return the canonical line-of-history for this revision.
110
113
 
111
114
    def get_summary(self):
112
115
        """Get the first line of the log message for this revision.
113
 
        """
114
 
        return self.message.lstrip().split('\n', 1)[0]
115
 
 
116
 
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((1, 13, 0)))
117
 
    def get_apparent_author(self):
118
 
        """Return the apparent author of this revision.
119
 
 
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]
 
116
 
 
117
        Return an empty string if message is None.
 
118
        """
 
119
        if self.message:
 
120
            return self.message.lstrip().split('\n', 1)[0]
 
121
        else:
 
122
            return ''
126
123
 
127
124
    def get_apparent_authors(self):
128
125
        """Return the apparent authors of this revision.
134
131
        """
135
132
        authors = self.properties.get('authors', None)
136
133
        if authors is None:
137
 
            author = self.properties.get('author', None)
 
134
            author = self.properties.get('author', self.committer)
138
135
            if author is None:
139
 
                return [self.committer]
 
136
                return []
140
137
            return [author]
141
138
        else:
142
139
            return authors.split("\n")
206
203
def is_reserved_id(revision_id):
207
204
    """Determine whether a revision id is reserved
208
205
 
209
 
    :return: True if the revision is is reserved, False otherwise
 
206
    :return: True if the revision is reserved, False otherwise
210
207
    """
211
208
    return isinstance(revision_id, basestring) and revision_id.endswith(':')
212
209