/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):
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
109
    """Write a bundle of revisions.
110
111
    :param repository: Repository containing revisions to serialize.
112
    :param revision_id: Head revision_id of the bundle.
113
    :param base_revision_id: Revision assumed to be present in repositories
114
         applying the bundle.
115
    :param out: Output file.
116
    """
1185.82.58 by Aaron Bentley
Handle empty branches properly
117
    if base_revision_id is NULL_REVISION:
118
        base_revision_id = None
1185.82.53 by Aaron Bentley
Factored out write_changeset to select revisions
119
    base_ancestry = set(repository.get_ancestry(base_revision_id))
120
    revision_ids = [r for r in repository.get_ancestry(revision_id) if r
121
                    not in base_ancestry]
122
    revision_ids = list(reversed(revision_ids))
1185.82.74 by Aaron Bentley
Allow custom base for any revision
123
    write(repository, revision_ids, out, 
124
          forced_bases = {revision_id:base_revision_id})
1185.82.53 by Aaron Bentley
Factored out write_changeset to select revisions
125
    return revision_ids
126
127
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
128
def format_highres_date(t, offset=0):
129
    """Format a date, such that it includes higher precision in the
130
    seconds field.
131
132
    :param t:   The local time in fractional seconds since the epoch
133
    :type t: float
134
    :param offset:  The timezone offset in integer seconds
135
    :type offset: int
136
137
    Example: format_highres_date(time.time(), -time.timezone)
138
    this will return a date stamp for right now,
139
    formatted for the local timezone.
140
141
    >>> from bzrlib.osutils import format_date
142
    >>> format_date(1120153132.350850105, 0)
143
    'Thu 2005-06-30 17:38:52 +0000'
144
    >>> format_highres_date(1120153132.350850105, 0)
145
    'Thu 2005-06-30 17:38:52.350850105 +0000'
146
    >>> format_date(1120153132.350850105, -5*3600)
147
    'Thu 2005-06-30 12:38:52 -0500'
148
    >>> format_highres_date(1120153132.350850105, -5*3600)
149
    'Thu 2005-06-30 12:38:52.350850105 -0500'
150
    >>> format_highres_date(1120153132.350850105, 7200)
151
    'Thu 2005-06-30 19:38:52.350850105 +0200'
1793.3.7 by John Arbash Meinel
Properly handle non-hour timezone offsets.
152
    >>> format_highres_date(1152428738.867522, 19800)
153
    'Sun 2006-07-09 12:35:38.867522001 +0530'
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
154
    """
155
    import time
156
    assert isinstance(t, float)
157
    
158
    # This has to be formatted for "original" date, so that the
159
    # revision XML entry will be reproduced faithfully.
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
160
    if offset is None:
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
161
        offset = 0
162
    tt = time.gmtime(t + offset)
163
164
    return (time.strftime("%a %Y-%m-%d %H:%M:%S", tt)
165
            + ('%.9f' % (t - int(t)))[1:] # Get the high-res seconds, but ignore the 0
166
            + ' %+03d%02d' % (offset / 3600, (offset / 60) % 60))
167
168
169
def unpack_highres_date(date):
170
    """This takes the high-resolution date stamp, and
171
    converts it back into the tuple (timestamp, timezone)
172
    Where timestamp is in real UTC since epoch seconds, and timezone is an integer
173
    number of seconds offset.
174
175
    :param date: A date formated by format_highres_date
176
    :type date: string
177
178
    >>> import time, random
179
    >>> unpack_highres_date('Thu 2005-06-30 12:38:52.350850105 -0500')
180
    (1120153132.3508501, -18000)
181
    >>> unpack_highres_date('Thu 2005-06-30 17:38:52.350850105 +0000')
182
    (1120153132.3508501, 0)
183
    >>> unpack_highres_date('Thu 2005-06-30 19:38:52.350850105 +0200')
184
    (1120153132.3508501, 7200)
1793.3.7 by John Arbash Meinel
Properly handle non-hour timezone offsets.
185
    >>> unpack_highres_date('Sun 2006-07-09 12:35:38.867522001 +0530')
186
    (1152428738.867522, 19800)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
187
    >>> from bzrlib.osutils import local_time_offset
188
    >>> t = time.time()
189
    >>> o = local_time_offset()
190
    >>> t2, o2 = unpack_highres_date(format_highres_date(t, o))
191
    >>> t == t2
192
    True
193
    >>> o == o2
194
    True
195
    >>> t -= 24*3600*365*2 # Start 2 years ago
196
    >>> o = -12*3600
197
    >>> for count in xrange(500):
198
    ...   t += random.random()*24*3600*30
199
    ...   o = ((o/3600 + 13) % 25 - 12)*3600 # Add 1 wrap around from [-12, 12]
200
    ...   date = format_highres_date(t, o)
201
    ...   t2, o2 = unpack_highres_date(date)
202
    ...   if t != t2 or o != o2:
203
    ...      print 'Failed on date %r, %s,%s diff:%s' % (date, t, o, t2-t)
204
    ...      break
205
206
    """
207
    import time, calendar
208
    # Up until the first period is a datestamp that is generated
209
    # as normal from time.strftime, so use time.strptime to
210
    # parse it
211
    dot_loc = date.find('.')
212
    if dot_loc == -1:
1907.2.1 by Hermann Kraus
Convert bundle errors from Exception to BzrNewError.
213
        raise ValueError(
214
            'Date string does not contain high-precision seconds: %r' % date)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
215
    base_time = time.strptime(date[:dot_loc], "%a %Y-%m-%d %H:%M:%S")
216
    fract_seconds, offset = date[dot_loc:].split()
217
    fract_seconds = float(fract_seconds)
1793.3.11 by John Arbash Meinel
Cleanup unpack_highres_date from Aaron's suggestions.
218
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
219
    offset = int(offset)
1793.3.11 by John Arbash Meinel
Cleanup unpack_highres_date from Aaron's suggestions.
220
221
    hours = int(offset / 100)
222
    minutes = (offset % 100)
223
    seconds_offset = (hours * 3600) + (minutes * 60)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
224
    
225
    # time.mktime returns localtime, but calendar.timegm returns UTC time
226
    timestamp = calendar.timegm(base_time)
1793.3.11 by John Arbash Meinel
Cleanup unpack_highres_date from Aaron's suggestions.
227
    timestamp -= seconds_offset
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
228
    # Add back in the fractional seconds
229
    timestamp += fract_seconds
1793.3.11 by John Arbash Meinel
Cleanup unpack_highres_date from Aaron's suggestions.
230
    return (timestamp, seconds_offset)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
231
232
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
233
class BundleSerializer(object):
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
234
    """The base class for Serializers.
235
236
    Common functionality should be included here.
237
    """
238
    def __init__(self, version):
239
        self.version = version
240
241
    def read(self, f):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
242
        """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.
243
244
        :param f: The file to read from
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
245
        :return: A list of bundle trees
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
246
        """
247
        raise NotImplementedError
248
1185.82.74 by Aaron Bentley
Allow custom base for any revision
249
    def write(self, source, revision_ids, forced_bases, f):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
250
        """Write the bundle to the supplied file.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
251
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
252
        :param source: A source for revision information
253
        :param revision_ids: The list of revision ids to serialize
1185.82.74 by Aaron Bentley
Allow custom base for any revision
254
        :param forced_bases: A dict of revision -> base that overrides default
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
255
        :param f: The file to output to
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
256
        """
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
257
        raise NotImplementedError
258
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
259
260
def register(version, klass, overwrite=False):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
261
    """Register a BundleSerializer version.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
262
263
    :param version: The version associated with this format
264
    :param klass: The class to instantiate, which must take a version argument
265
    """
266
    global _serializers
267
    if overwrite:
268
        _serializers[version] = klass
269
        return
270
1963.2.1 by Robey Pointer
remove usage of has_key()
271
    if version not in _serializers:
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
272
        _serializers[version] = klass
273
274
275
def register_lazy(version, module, classname, overwrite=False):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
276
    """Register lazy-loaded bundle serializer.
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
277
278
    :param version: The version associated with this reader
279
    :param module: String indicating what module should be loaded
280
    :param classname: Name of the class that will be instantiated
281
    :param overwrite: Should this version override a default
282
    """
283
    def _loader(version):
284
        mod = __import__(module, globals(), locals(), [classname])
285
        klass = getattr(mod, classname)
286
        return klass(version)
1185.82.4 by John Arbash Meinel
Created output format, slightly simplified code
287
    register(version, _loader, overwrite=overwrite)
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
288
289
1185.82.96 by Aaron Bentley
Got first binary test passing
290
def binary_diff(old_filename, old_lines, new_filename, new_lines, to_file):
291
    temp = StringIO()
292
    internal_diff(old_filename, old_lines, new_filename, new_lines, temp,
293
                  allow_binary=True)
294
    temp.seek(0)
295
    base64.encode(temp, to_file)
296
    to_file.write('\n')
297
1551.7.3 by Aaron Bentley
Fix strict testaments, as_sha1
298
register_lazy('0.8', 'bzrlib.bundle.serializer.v08', 'BundleSerializerV08')
299
register_lazy(None, 'bzrlib.bundle.serializer.v08', 'BundleSerializerV08')
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
300