/brz/remove-bazaar

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