/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5452.4.3 by John Arbash Meinel
Merge bzr.dev to resolve bzr-2.3.txt (aka NEWS)
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
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
#
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
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
#
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
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
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
16
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
17
"""Serializer factory for reading and writing bundles.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
18
"""
19
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
20
from __future__ import absolute_import
21
1185.82.96 by Aaron Bentley
Got first binary test passing
22
import base64
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
23
import re
24
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
25
from ... import (
5436.2.1 by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__.
26
    errors,
27
    pyutils,
28
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
29
from ...diff import internal_diff
30
from ...revision import NULL_REVISION
31
from ...sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
32
    BytesIO,
33
    )
1551.12.46 by Aaron Bentley
Import highres date functions to old location
34
# For backwards-compatibility
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
35
from ...timestamp import unpack_highres_date, format_highres_date
1551.12.46 by Aaron Bentley
Import highres date functions to old location
36
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
37
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
38
# New bundles should try to use this header format
6855.4.5 by Jelmer Vernooij
Fix more bees, use with rather than try/finally for some files.
39
BUNDLE_HEADER = b'# Bazaar revision bundle v'
1907.2.2 by Hermann Kraus
Detect wrong eol markers.
40
BUNDLE_HEADER_RE = re.compile(
6855.3.1 by Jelmer Vernooij
Several more fixes.
41
    br'^# Bazaar revision bundle v(?P<version>\d+[\w.]*)(?P<lineending>\r?)\n$')
1907.2.2 by Hermann Kraus
Detect wrong eol markers.
42
CHANGESET_OLD_HEADER_RE = re.compile(
6855.3.1 by Jelmer Vernooij
Several more fixes.
43
    br'^# Bazaar-NG changeset v(?P<version>\d+[\w.]*)(?P<lineending>\r?)\n$')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
44
45
1793.3.16 by John Arbash Meinel
Add tests to ensure that we gracefully handle opening and trailing non-bundle text.
46
_serializers = {}
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
47
2520.4.136 by Aaron Bentley
Fix format strings
48
v4_string = '4'
2520.4.123 by Aaron Bentley
Cleanup of bundle code
49
2520.4.14 by Aaron Bentley
Get most tests passing, use format header
50
def _get_bundle_header(version):
51
    return '%s%s\n' % (BUNDLE_HEADER, version)
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
52
53
def _get_filename(f):
1963.2.4 by Robey Pointer
remove usage of hasattr
54
    return getattr(f, 'name', '<unknown>')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
55
56
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
57
def read_bundle(f):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
58
    """Read in a bundle from a filelike object.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
59
60
    :param f: A file-like object
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
61
    :return: A list of Bundle objects
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
62
    """
63
    version = None
64
    for line in f:
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
65
        m = BUNDLE_HEADER_RE.match(line)
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
66
        if m:
1907.2.2 by Hermann Kraus
Detect wrong eol markers.
67
            if m.group('lineending') != '':
68
                raise errors.UnsupportedEOLMarker()
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
69
            version = m.group('version')
70
            break
1793.2.7 by Aaron Bentley
Fix reporting of malformed, (especially, crlf) bundles
71
        elif line.startswith(BUNDLE_HEADER):
1907.2.1 by Hermann Kraus
Convert bundle errors from Exception to BzrNewError.
72
            raise errors.MalformedHeader(
73
                'Extra characters after version number')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
74
        m = CHANGESET_OLD_HEADER_RE.match(line)
75
        if m:
76
            version = m.group('version')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
77
            raise errors.BundleNotSupported(version,
1907.2.1 by Hermann Kraus
Convert bundle errors from Exception to BzrNewError.
78
                'old format bundles not supported')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
79
80
    if version is None:
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
81
        raise errors.NotABundle('Did not find an opening header')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
82
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
83
    # Now we have a version, to figure out how to read the bundle
1963.2.1 by Robey Pointer
remove usage of has_key()
84
    if version not in _serializers:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
85
        raise errors.BundleNotSupported(version,
1907.2.1 by Hermann Kraus
Convert bundle errors from Exception to BzrNewError.
86
            'version not listed in known versions')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
87
88
    serializer = _serializers[version](version)
89
90
    return serializer.read(f)
91
92
2520.4.53 by Aaron Bentley
refactor bundle serialization to make write_bundle primary
93
def get_serializer(version):
94
    try:
95
        return _serializers[version](version)
96
    except KeyError:
97
        raise errors.BundleNotSupported(version, 'unknown bundle format')
98
99
1185.82.74 by Aaron Bentley
Allow custom base for any revision
100
def write(source, revision_ids, f, version=None, forced_bases={}):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
101
    """Serialize a list of bundles to a filelike object.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
102
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
103
    :param source: A source for revision information
104
    :param revision_ids: The list of revision ids to serialize
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
105
    :param f: The file to output to
106
    :param version: [optional] target serialization version
107
    """
108
6754.8.4 by Jelmer Vernooij
Use new context stuff.
109
    with source.lock_read():
2520.4.53 by Aaron Bentley
refactor bundle serialization to make write_bundle primary
110
        return get_serializer(version).write(source, revision_ids,
111
                                             forced_bases, f)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
112
113
1910.2.50 by Aaron Bentley
start work on format 0.9 serializer
114
def write_bundle(repository, revision_id, base_revision_id, out, format=None):
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
115
    """Write a bundle of revisions.
116
117
    :param repository: Repository containing revisions to serialize.
118
    :param revision_id: Head revision_id of the bundle.
119
    :param base_revision_id: Revision assumed to be present in repositories
120
         applying the bundle.
121
    :param out: Output file.
122
    """
6754.8.4 by Jelmer Vernooij
Use new context stuff.
123
    with repository.lock_read():
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
124
        return get_serializer(format).write_bundle(repository, revision_id,
125
                                                   base_revision_id, out)
1185.82.53 by Aaron Bentley
Factored out write_changeset to select revisions
126
127
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
128
class BundleSerializer(object):
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
129
    """The base class for Serializers.
130
131
    Common functionality should be included here.
132
    """
133
    def __init__(self, version):
134
        self.version = version
135
136
    def read(self, f):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
137
        """Read the rest of the bundles from the supplied file.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
138
139
        :param f: The file to read from
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
140
        :return: A list of bundle trees
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
141
        """
142
        raise NotImplementedError
143
2520.4.53 by Aaron Bentley
refactor bundle serialization to make write_bundle primary
144
    def write_bundle(self, repository, target, base, fileobj):
145
        """Write the bundle to the supplied file.
146
147
        :param repository: The repository to retrieve revision data from
148
        :param target: The revision to provide data for
149
        :param base: The most recent of ancestor of the revision that does not
150
            need to be included in the bundle
151
        :param fileobj: The file to output to
152
        """
153
        raise NotImplementedError
154
155
    def _write_bundle(self, repository, revision_id, base_revision_id, out):
156
        """Helper function for translating write_bundle to write"""
157
        forced_bases = {revision_id:base_revision_id}
158
        if base_revision_id is NULL_REVISION:
159
            base_revision_id = None
5972.3.4 by Jelmer Vernooij
Use find_unique_ancestors in bundle code.
160
        graph = repository.get_graph()
161
        revision_ids = graph.find_unique_ancestors(revision_id,
162
            [base_revision_id])
2520.4.63 by Aaron Bentley
Merge bzr.dev
163
        revision_ids = list(repository.get_graph().iter_topo_order(
164
            revision_ids))
165
        revision_ids.reverse()
2520.4.53 by Aaron Bentley
refactor bundle serialization to make write_bundle primary
166
        self.write(repository, revision_ids, forced_bases, out)
167
        return revision_ids
168
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
169
170
def register(version, klass, overwrite=False):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
171
    """Register a BundleSerializer version.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
172
173
    :param version: The version associated with this format
174
    :param klass: The class to instantiate, which must take a version argument
175
    """
176
    global _serializers
177
    if overwrite:
178
        _serializers[version] = klass
179
        return
180
1963.2.1 by Robey Pointer
remove usage of has_key()
181
    if version not in _serializers:
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
182
        _serializers[version] = klass
183
184
185
def register_lazy(version, module, classname, overwrite=False):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
186
    """Register lazy-loaded bundle serializer.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
187
188
    :param version: The version associated with this reader
189
    :param module: String indicating what module should be loaded
190
    :param classname: Name of the class that will be instantiated
191
    :param overwrite: Should this version override a default
192
    """
193
    def _loader(version):
5436.2.1 by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__.
194
        klass = pyutils.get_named_object(module, classname)
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
195
        return klass(version)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
196
    register(version, _loader, overwrite=overwrite)
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
197
198
1185.82.96 by Aaron Bentley
Got first binary test passing
199
def binary_diff(old_filename, old_lines, new_filename, new_lines, to_file):
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
200
    temp = BytesIO()
1185.82.96 by Aaron Bentley
Got first binary test passing
201
    internal_diff(old_filename, old_lines, new_filename, new_lines, temp,
202
                  allow_binary=True)
203
    temp.seek(0)
204
    base64.encode(temp, to_file)
205
    to_file.write('\n')
206
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
207
register_lazy('0.8', 'breezy.bundle.serializer.v08', 'BundleSerializerV08')
208
register_lazy('0.9', 'breezy.bundle.serializer.v09', 'BundleSerializerV09')
209
register_lazy(v4_string, 'breezy.bundle.serializer.v4',
2520.4.72 by Aaron Bentley
Rename format to 4alpha
210
              'BundleSerializerV4')
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
211
register_lazy(None, 'breezy.bundle.serializer.v4', 'BundleSerializerV4')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
212