/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/__init__.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
 
38
38
 
39
39
def _get_filename(f):
40
 
    if hasattr(f, 'name'):
41
 
        return f.name
42
 
    return '<unknown>'
 
40
    return getattr(f, 'name', '<unknown>')
43
41
 
44
42
 
45
43
def read_bundle(f):
108
106
 
109
107
 
110
108
def _write_bundle(repository, revision_id, base_revision_id, out):
 
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
    """
111
117
    if base_revision_id is NULL_REVISION:
112
118
        base_revision_id = None
113
119
    base_ancestry = set(repository.get_ancestry(base_revision_id))
151
157
    
152
158
    # This has to be formatted for "original" date, so that the
153
159
    # revision XML entry will be reproduced faithfully.
154
 
    if offset == None:
 
160
    if offset is None:
155
161
        offset = 0
156
162
    tt = time.gmtime(t + offset)
157
163