/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 mapping.py

Fix formatting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mapping.py
1
 
# Copyright (C) 2007-2008 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
 
3
# Copyright (C) 2008 John Carr
2
4
#
3
5
# This program is free software; you can redistribute it and/or modify
4
6
# it under the terms of the GNU General Public License as published by
16
18
 
17
19
"""Converters, etc for going between Bazaar and Git ids."""
18
20
 
19
 
from bzrlib import errors, foreign, urlutils
20
 
from bzrlib.inventory import ROOT_ID
 
21
from bzrlib import (
 
22
    errors,
 
23
    foreign,
 
24
    urlutils,
 
25
    )
 
26
from bzrlib.inventory import (
 
27
    ROOT_ID,
 
28
    )
21
29
from bzrlib.foreign import (
22
 
        ForeignVcs, 
23
 
        VcsMappingRegistry, 
24
 
        ForeignRevision,
25
 
        )
 
30
    ForeignVcs, 
 
31
    VcsMappingRegistry, 
 
32
    ForeignRevision,
 
33
    )
26
34
 
27
35
def escape_file_id(file_id):
28
36
    return file_id.replace('_', '__').replace(' ', '_s')
133
141
 
134
142
    # stack contains the set of trees that we haven't 
135
143
    # finished constructing
136
 
 
137
144
    for path, entry in inv.iter_entries():
138
145
        while stack and not path.startswith(cur):
139
146
            tree.serialize()
187
194
    for p in rev.parent_ids:
188
195
        git_p = parent_lookup(p)
189
196
        if git_p is not None:
 
197
            assert len(git_p) == 40, "unexpected length for %r" % git_p
190
198
            commit._parents.append(git_p)
191
199
    commit._message = rev.message.encode("utf-8")
192
200
    commit._committer = rev.committer.encode("utf-8")
193
 
    commit._author = rev.get_apparent_author().encode("utf-8")
 
201
    commit._author = rev.get_apparent_authors()[0].encode("utf-8")
194
202
    commit._commit_time = long(rev.timestamp)
195
203
    commit.serialize()
196
204
    return commit