/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
    )
 
34
from bzrlib.plugins.git.foreign import (
 
35
    escape_commit_message,
 
36
    )
 
37
 
26
38
 
27
39
def escape_file_id(file_id):
28
40
    return file_id.replace('_', '__').replace(' ', '_s')
55
67
        return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
56
68
 
57
69
    def generate_file_id(self, path):
 
70
        # Git paths are just bytestrings
 
71
        # We must just hope they are valid UTF-8..
 
72
        assert isinstance(path, str)
58
73
        if path == "":
59
74
            return ROOT_ID
60
 
        return escape_file_id(path.encode('utf-8'))
 
75
        return escape_file_id(path)
 
76
 
 
77
    def parse_file_id(self, file_id):
 
78
        if file_id == ROOT_ID:
 
79
            return ""
 
80
        return unescape_file_id(file_id)
61
81
 
62
82
    def import_commit(self, commit):
63
83
        """Convert a git commit to a bzr revision.
68
88
            raise AssertionError("Commit object can't be None")
69
89
        rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
70
90
        rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
71
 
        rev.message = commit.message.decode("utf-8", "replace")
72
 
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
91
        rev.message = escape_commit_message(commit.message.decode("utf-8", "replace"))
 
92
        rev.committer = escape_commit_message(str(commit.committer).decode("utf-8", "replace"))
73
93
        if commit.committer != commit.author:
74
 
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
94
            rev.properties['author'] = escape_commit_message(str(commit.author).decode("utf-8", "replace"))
75
95
        rev.timestamp = commit.commit_time
76
96
        rev.timezone = 0
77
97
        return rev
133
153
 
134
154
    # stack contains the set of trees that we haven't 
135
155
    # finished constructing
136
 
 
137
156
    for path, entry in inv.iter_entries():
138
157
        while stack and not path.startswith(cur):
139
158
            tree.serialize()
187
206
    for p in rev.parent_ids:
188
207
        git_p = parent_lookup(p)
189
208
        if git_p is not None:
 
209
            assert len(git_p) == 40, "unexpected length for %r" % git_p
190
210
            commit._parents.append(git_p)
191
211
    commit._message = rev.message.encode("utf-8")
192
212
    commit._committer = rev.committer.encode("utf-8")
193
 
    commit._author = rev.get_apparent_author().encode("utf-8")
 
213
    commit._author = rev.get_apparent_authors()[0].encode("utf-8")
194
214
    commit._commit_time = long(rev.timestamp)
195
215
    commit.serialize()
196
216
    return commit