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