/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
1
# (C) 2005 Canonical Development 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
1185.82.96 by Aaron Bentley
Got first binary test passing
20
import base64
21
from StringIO import StringIO
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
22
import re
23
24
import bzrlib.errors as errors
1185.82.96 by Aaron Bentley
Got first binary test passing
25
from bzrlib.diff import internal_diff
1185.82.58 by Aaron Bentley
Handle empty branches properly
26
from bzrlib.revision import NULL_REVISION
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
27
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
28
# New bundles should try to use this header format
29
BUNDLE_HEADER = '# Bazaar revision bundle v'
1907.2.2 by Hermann Kraus
Detect wrong eol markers.
30
BUNDLE_HEADER_RE = re.compile(
31
    r'^# Bazaar revision bundle v(?P<version>\d+[\w.]*)(?P<lineending>\r?)\n$')
32
CHANGESET_OLD_HEADER_RE = re.compile(
33
    r'^# 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.
34
35
1793.3.16 by John Arbash Meinel
Add tests to ensure that we gracefully handle opening and trailing non-bundle text.
36
_serializers = {}
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
37
38
39
def _get_filename(f):
1963.2.4 by Robey Pointer
remove usage of hasattr
40
    return getattr(f, 'name', '<unknown>')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
41
42
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
43
def read_bundle(f):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
44
    """Read in a bundle from a filelike object.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
45
46
    :param f: A file-like object
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
47
    :return: A list of Bundle objects
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
48
    """
49
    version = None
50
    for line in f:
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
51
        m = BUNDLE_HEADER_RE.match(line)
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
52
        if m:
1907.2.2 by Hermann Kraus
Detect wrong eol markers.
53
            if m.group('lineending') != '':
54
                raise errors.UnsupportedEOLMarker()
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
55
            version = m.group('version')
56
            break
1793.2.7 by Aaron Bentley
Fix reporting of malformed, (especially, crlf) bundles
57
        elif line.startswith(BUNDLE_HEADER):
1907.2.1 by Hermann Kraus
Convert bundle errors from Exception to BzrNewError.
58
            raise errors.MalformedHeader(
59
                'Extra characters after version number')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
60
        m = CHANGESET_OLD_HEADER_RE.match(line)
61
        if m:
62
            version = m.group('version')
1907.2.1 by Hermann Kraus
Convert bundle errors from Exception to BzrNewError.
63
            raise errors.BundleNotSupported(version, 
64
                'old format bundles not supported')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
65
66
    if version is None:
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
67
        raise errors.NotABundle('Did not find an opening header')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
68
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
69
    # Now we have a version, to figure out how to read the bundle 
1963.2.1 by Robey Pointer
remove usage of has_key()
70
    if version not in _serializers:
1907.2.1 by Hermann Kraus
Convert bundle errors from Exception to BzrNewError.
71
        raise errors.BundleNotSupported(version, 
72
            'version not listed in known versions')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
73
74
    serializer = _serializers[version](version)
75
76
    return serializer.read(f)
77
78
1185.82.74 by Aaron Bentley
Allow custom base for any revision
79
def write(source, revision_ids, f, version=None, forced_bases={}):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
80
    """Serialize a list of bundles to a filelike object.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
81
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
82
    :param source: A source for revision information
83
    :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.
84
    :param f: The file to output to
85
    :param version: [optional] target serialization version
86
    """
87
1963.2.1 by Robey Pointer
remove usage of has_key()
88
    if version not in _serializers:
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
89
        raise errors.BundleNotSupported(version, 'unknown bundle format')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
90
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
91
    serializer = _serializers[version](version)
1927.1.1 by John Arbash Meinel
Lock the repository more often
92
    source.lock_read()
93
    try:
94
        return serializer.write(source, revision_ids, forced_bases, f)
95
    finally:
96
        source.unlock()
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
97
98
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
99
def write_bundle(repository, revision_id, base_revision_id, out):
1185.82.53 by Aaron Bentley
Factored out write_changeset to select revisions
100
    """"""
1927.1.1 by John Arbash Meinel
Lock the repository more often
101
    repository.lock_read()
102
    try:
103
        return _write_bundle(repository, revision_id, base_revision_id, out)
104
    finally:
105
        repository.unlock()
106
107
108
def _write_bundle(repository, revision_id, base_revision_id, out):
1185.82.58 by Aaron Bentley
Handle empty branches properly
109
    if base_revision_id is NULL_REVISION:
110
        base_revision_id = None
1185.82.53 by Aaron Bentley
Factored out write_changeset to select revisions
111
    base_ancestry = set(repository.get_ancestry(base_revision_id))
112
    revision_ids = [r for r in repository.get_ancestry(revision_id) if r
113
                    not in base_ancestry]
114
    revision_ids = list(reversed(revision_ids))
1185.82.74 by Aaron Bentley
Allow custom base for any revision
115
    write(repository, revision_ids, out, 
116
          forced_bases = {revision_id:base_revision_id})
1185.82.53 by Aaron Bentley
Factored out write_changeset to select revisions
117
    return revision_ids
118
119
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
120
def format_highres_date(t, offset=0):
121
    """Format a date, such that it includes higher precision in the
122
    seconds field.
123
124
    :param t:   The local time in fractional seconds since the epoch
125
    :type t: float
126
    :param offset:  The timezone offset in integer seconds
127
    :type offset: int
128
129
    Example: format_highres_date(time.time(), -time.timezone)
130
    this will return a date stamp for right now,
131
    formatted for the local timezone.
132
133
    >>> from bzrlib.osutils import format_date
134
    >>> format_date(1120153132.350850105, 0)
135
    'Thu 2005-06-30 17:38:52 +0000'
136
    >>> format_highres_date(1120153132.350850105, 0)
137
    'Thu 2005-06-30 17:38:52.350850105 +0000'
138
    >>> format_date(1120153132.350850105, -5*3600)
139
    'Thu 2005-06-30 12:38:52 -0500'
140
    >>> format_highres_date(1120153132.350850105, -5*3600)
141
    'Thu 2005-06-30 12:38:52.350850105 -0500'
142
    >>> format_highres_date(1120153132.350850105, 7200)
143
    'Thu 2005-06-30 19:38:52.350850105 +0200'
1793.3.7 by John Arbash Meinel
Properly handle non-hour timezone offsets.
144
    >>> format_highres_date(1152428738.867522, 19800)
145
    'Sun 2006-07-09 12:35:38.867522001 +0530'
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
146
    """
147
    import time
148
    assert isinstance(t, float)
149
    
150
    # This has to be formatted for "original" date, so that the
151
    # revision XML entry will be reproduced faithfully.
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
152
    if offset is None:
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
153
        offset = 0
154
    tt = time.gmtime(t + offset)
155
156
    return (time.strftime("%a %Y-%m-%d %H:%M:%S", tt)
157
            + ('%.9f' % (t - int(t)))[1:] # Get the high-res seconds, but ignore the 0
158
            + ' %+03d%02d' % (offset / 3600, (offset / 60) % 60))
159
160
161
def unpack_highres_date(date):
162
    """This takes the high-resolution date stamp, and
163
    converts it back into the tuple (timestamp, timezone)
164
    Where timestamp is in real UTC since epoch seconds, and timezone is an integer
165
    number of seconds offset.
166
167
    :param date: A date formated by format_highres_date
168
    :type date: string
169
170
    >>> import time, random
171
    >>> unpack_highres_date('Thu 2005-06-30 12:38:52.350850105 -0500')
172
    (1120153132.3508501, -18000)
173
    >>> unpack_highres_date('Thu 2005-06-30 17:38:52.350850105 +0000')
174
    (1120153132.3508501, 0)
175
    >>> unpack_highres_date('Thu 2005-06-30 19:38:52.350850105 +0200')
176
    (1120153132.3508501, 7200)
1793.3.7 by John Arbash Meinel
Properly handle non-hour timezone offsets.
177
    >>> unpack_highres_date('Sun 2006-07-09 12:35:38.867522001 +0530')
178
    (1152428738.867522, 19800)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
179
    >>> from bzrlib.osutils import local_time_offset
180
    >>> t = time.time()
181
    >>> o = local_time_offset()
182
    >>> t2, o2 = unpack_highres_date(format_highres_date(t, o))
183
    >>> t == t2
184
    True
185
    >>> o == o2
186
    True
187
    >>> t -= 24*3600*365*2 # Start 2 years ago
188
    >>> o = -12*3600
189
    >>> for count in xrange(500):
190
    ...   t += random.random()*24*3600*30
191
    ...   o = ((o/3600 + 13) % 25 - 12)*3600 # Add 1 wrap around from [-12, 12]
192
    ...   date = format_highres_date(t, o)
193
    ...   t2, o2 = unpack_highres_date(date)
194
    ...   if t != t2 or o != o2:
195
    ...      print 'Failed on date %r, %s,%s diff:%s' % (date, t, o, t2-t)
196
    ...      break
197
198
    """
199
    import time, calendar
200
    # Up until the first period is a datestamp that is generated
201
    # as normal from time.strftime, so use time.strptime to
202
    # parse it
203
    dot_loc = date.find('.')
204
    if dot_loc == -1:
1907.2.1 by Hermann Kraus
Convert bundle errors from Exception to BzrNewError.
205
        raise ValueError(
206
            'Date string does not contain high-precision seconds: %r' % date)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
207
    base_time = time.strptime(date[:dot_loc], "%a %Y-%m-%d %H:%M:%S")
208
    fract_seconds, offset = date[dot_loc:].split()
209
    fract_seconds = float(fract_seconds)
1793.3.11 by John Arbash Meinel
Cleanup unpack_highres_date from Aaron's suggestions.
210
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
211
    offset = int(offset)
1793.3.11 by John Arbash Meinel
Cleanup unpack_highres_date from Aaron's suggestions.
212
213
    hours = int(offset / 100)
214
    minutes = (offset % 100)
215
    seconds_offset = (hours * 3600) + (minutes * 60)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
216
    
217
    # time.mktime returns localtime, but calendar.timegm returns UTC time
218
    timestamp = calendar.timegm(base_time)
1793.3.11 by John Arbash Meinel
Cleanup unpack_highres_date from Aaron's suggestions.
219
    timestamp -= seconds_offset
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
220
    # Add back in the fractional seconds
221
    timestamp += fract_seconds
1793.3.11 by John Arbash Meinel
Cleanup unpack_highres_date from Aaron's suggestions.
222
    return (timestamp, seconds_offset)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
223
224
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
225
class BundleSerializer(object):
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
226
    """The base class for Serializers.
227
228
    Common functionality should be included here.
229
    """
230
    def __init__(self, version):
231
        self.version = version
232
233
    def read(self, f):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
234
        """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.
235
236
        :param f: The file to read from
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
237
        :return: A list of bundle trees
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
238
        """
239
        raise NotImplementedError
240
1185.82.74 by Aaron Bentley
Allow custom base for any revision
241
    def write(self, source, revision_ids, forced_bases, f):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
242
        """Write the bundle to the supplied file.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
243
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
244
        :param source: A source for revision information
245
        :param revision_ids: The list of revision ids to serialize
1185.82.74 by Aaron Bentley
Allow custom base for any revision
246
        :param forced_bases: A dict of revision -> base that overrides default
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
247
        :param f: The file to output to
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
248
        """
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
249
        raise NotImplementedError
250
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
251
252
def register(version, klass, overwrite=False):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
253
    """Register a BundleSerializer version.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
254
255
    :param version: The version associated with this format
256
    :param klass: The class to instantiate, which must take a version argument
257
    """
258
    global _serializers
259
    if overwrite:
260
        _serializers[version] = klass
261
        return
262
1963.2.1 by Robey Pointer
remove usage of has_key()
263
    if version not in _serializers:
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
264
        _serializers[version] = klass
265
266
267
def register_lazy(version, module, classname, overwrite=False):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
268
    """Register lazy-loaded bundle serializer.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
269
270
    :param version: The version associated with this reader
271
    :param module: String indicating what module should be loaded
272
    :param classname: Name of the class that will be instantiated
273
    :param overwrite: Should this version override a default
274
    """
275
    def _loader(version):
276
        mod = __import__(module, globals(), locals(), [classname])
277
        klass = getattr(mod, classname)
278
        return klass(version)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
279
    register(version, _loader, overwrite=overwrite)
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
280
281
1185.82.96 by Aaron Bentley
Got first binary test passing
282
def binary_diff(old_filename, old_lines, new_filename, new_lines, to_file):
283
    temp = StringIO()
284
    internal_diff(old_filename, old_lines, new_filename, new_lines, temp,
285
                  allow_binary=True)
286
    temp.seek(0)
287
    base64.encode(temp, to_file)
288
    to_file.write('\n')
289
1551.7.3 by Aaron Bentley
Fix strict testaments, as_sha1
290
register_lazy('0.8', 'bzrlib.bundle.serializer.v08', 'BundleSerializerV08')
291
register_lazy(None, 'bzrlib.bundle.serializer.v08', 'BundleSerializerV08')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
292