/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
1
# Copyright (C) 2007 Canonical Ltd
2
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
3
# Copyright (C) 2008 John Carr
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
4
#
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
9
#
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
19
"""Converters, etc for going between Bazaar and Git ids."""
20
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
21
import stat
22
0.200.292 by Jelmer Vernooij
Fix formatting.
23
from bzrlib import (
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
24
    bencode,
0.200.292 by Jelmer Vernooij
Fix formatting.
25
    errors,
26
    foreign,
0.200.356 by Jelmer Vernooij
Fix nasty bug in inventory_to_trees_and_blobs
27
    osutils,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
28
    trace,
0.200.292 by Jelmer Vernooij
Fix formatting.
29
    urlutils,
30
    )
31
from bzrlib.inventory import (
32
    ROOT_ID,
33
    )
0.200.152 by Jelmer Vernooij
Fix syntax errors.
34
from bzrlib.foreign import (
0.200.292 by Jelmer Vernooij
Fix formatting.
35
    ForeignVcs, 
36
    VcsMappingRegistry, 
37
    ForeignRevision,
38
    )
0.200.309 by Jelmer Vernooij
Add XML escaping to work around serialization bug in bzr.
39
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
40
DEFAULT_FILE_MODE = stat.S_IFREG | 0644
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
41
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
42
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
43
def escape_file_id(file_id):
44
    return file_id.replace('_', '__').replace(' ', '_s')
45
46
47
def unescape_file_id(file_id):
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
48
    ret = []
49
    i = 0
50
    while i < len(file_id):
51
        if file_id[i] != '_':
52
            ret.append(file_id[i])
53
        else:
54
            if file_id[i+1] == '_':
55
                ret.append("_")
56
            elif file_id[i+1] == 's':
57
                ret.append(" ")
58
            else:
59
                raise AssertionError("unknown escape character %s" % file_id[i+1])
60
            i += 1
61
        i += 1
62
    return "".join(ret)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
63
64
0.200.376 by Jelmer Vernooij
Make sure author and committer names pushed to git contain < and >, otherwise the git parser barfs.
65
def fix_person_identifier(text):
66
    if "<" in text and ">" in text:
67
        return text
68
    return "%s <%s>" % (text, text)
69
70
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
71
def warn_escaped(commit, num_escaped):
72
    trace.warning("Escaped %d XML-invalid characters in %s. Will be unable "
73
                  "to regenerate the SHA map.", num_escaped, commit)
74
75
76
def warn_unusual_mode(commit, path, mode):
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
77
    trace.mutter("Unusual file mode %o for %s in %s. Storing as revision property. ",
78
                 mode, path, commit)
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
79
80
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
81
def squash_revision(target_repo, rev):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
82
    """Remove characters that can't be stored from a revision, if necessary.
83
    
84
    :param target_repo: Repository in which the revision will be stored
85
    :param rev: Revision object, will be modified in-place
86
    """
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
87
    if not getattr(target_repo._serializer, "squashes_xml_invalid_characters", True):
88
        return
89
    from bzrlib.xml_serializer import escape_invalid_chars
90
    rev.message, num_escaped = escape_invalid_chars(rev.message)
91
    if num_escaped:
92
        warn_escaped(rev.foreign_revid, num_escaped)
93
    if 'author' in rev.properties:
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
94
        rev.properties['author'], num_escaped = escape_invalid_chars(
95
            rev.properties['author'])
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
96
        if num_escaped:
97
            warn_escaped(rev.foreign_revid, num_escaped)
98
    rev.committer, num_escaped = escape_invalid_chars(rev.committer)
99
    if num_escaped:
100
        warn_escaped(rev.foreign_revid, num_escaped)
101
102
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
103
class BzrGitMapping(foreign.VcsMapping):
0.200.97 by Jelmer Vernooij
use mapping object.
104
    """Class that maps between Git and Bazaar semantics."""
105
    experimental = False
106
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
107
    def __init__(self):
108
        super(BzrGitMapping, self).__init__(foreign_git)
109
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
110
    def __eq__(self, other):
111
        return type(self) == type(other) and self.revid_prefix == other.revid_prefix
112
113
    @classmethod
114
    def revision_id_foreign_to_bzr(cls, git_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
115
        """Convert a git revision id handle to a Bazaar revision id."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
116
        return "%s:%s" % (cls.revid_prefix, git_rev_id)
0.200.97 by Jelmer Vernooij
use mapping object.
117
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
118
    @classmethod
119
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
120
        """Convert a Bazaar revision id to a git revision id handle."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
121
        if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
122
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
123
        return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
0.200.97 by Jelmer Vernooij
use mapping object.
124
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
125
    def generate_file_id(self, path):
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
126
        # Git paths are just bytestrings
127
        # We must just hope they are valid UTF-8..
0.200.157 by Jelmer Vernooij
Fix some bit of fetching.
128
        if path == "":
129
            return ROOT_ID
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
130
        return escape_file_id(path)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
131
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
132
    def parse_file_id(self, file_id):
133
        if file_id == ROOT_ID:
134
            return ""
135
        return unescape_file_id(file_id)
136
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
137
    def import_unusual_file_modes(self, rev, unusual_file_modes):
138
        if unusual_file_modes:
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
139
            ret = [(name, unusual_file_modes[name]) for name in sorted(unusual_file_modes.keys())]
140
            rev.properties['file-modes'] = bencode.bencode(ret)
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
141
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
142
    def export_unusual_file_modes(self, rev):
143
        try:
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
144
            return dict([(self.generate_file_id(path), mode) for (path, mode) in bencode.bdecode(rev.properties['file-modes'])])
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
145
        except KeyError:
146
            return {}
147
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
148
    def import_commit(self, commit):
149
        """Convert a git commit to a bzr revision.
150
151
        :return: a `bzrlib.revision.Revision` object.
152
        """
153
        if commit is None:
154
            raise AssertionError("Commit object can't be None")
155
        rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
156
        rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
157
        rev.message = commit.message.decode("utf-8", "replace")
158
        rev.committer = str(commit.committer).decode("utf-8", "replace")
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
159
        if commit.committer != commit.author:
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
160
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
0.200.350 by Jelmer Vernooij
Support author_time
161
162
        if commit.commit_time != commit.author_time:
163
            rev.properties['author-timestamp'] = str(commit.author_time)
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
164
        if commit.commit_timezone != commit.author_timezone:
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
165
            rev.properties['author-timezone'] = "%d" % (commit.author_timezone, )
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
166
        rev.timestamp = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
167
        rev.timezone = commit.commit_timezone
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
168
        return rev
169
0.200.97 by Jelmer Vernooij
use mapping object.
170
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
171
class BzrGitMappingv1(BzrGitMapping):
172
    revid_prefix = 'git-v1'
173
    experimental = False
174
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
175
    def __str__(self):
176
        return self.revid_prefix
177
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
178
179
class BzrGitMappingExperimental(BzrGitMappingv1):
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
180
    revid_prefix = 'git-experimental'
181
    experimental = True
0.200.97 by Jelmer Vernooij
use mapping object.
182
183
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
184
class GitMappingRegistry(VcsMappingRegistry):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
185
    """Registry with available git mappings."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
186
187
    def revision_id_bzr_to_foreign(self, bzr_revid):
188
        if not bzr_revid.startswith("git-"):
189
            raise errors.InvalidRevisionId(bzr_revid, None)
190
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
191
        mapping = self.get(mapping_version)
192
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
193
194
    parse_revision_id = revision_id_bzr_to_foreign
195
196
197
mapping_registry = GitMappingRegistry()
198
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
199
                                   "BzrGitMappingv1")
200
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
201
                                   "BzrGitMappingExperimental")
202
203
204
class ForeignGit(ForeignVcs):
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
205
    """The Git Stupid Content Tracker"""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
206
207
    def __init__(self):
208
        super(ForeignGit, self).__init__(mapping_registry)
209
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
210
    @classmethod
211
    def show_foreign_revid(cls, foreign_revid):
212
        return { "git commit": foreign_revid }
213
214
215
foreign_git = ForeignGit()
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
216
default_mapping = BzrGitMappingv1()
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
217
218
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
219
def text_to_blob(texts, entry):
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
220
    from dulwich.objects import Blob
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
221
    text = texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
222
    blob = Blob()
223
    blob._text = text
224
    return blob
225
226
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
227
def symlink_to_blob(entry):
228
    from dulwich.objects import Blob
229
    blob = Blob()
230
    blob._text = entry.symlink_target
231
    return blob
232
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
233
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
234
def mode_is_executable(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
235
    """Check if mode should be considered executable."""
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
236
    return bool(mode & 0111)
237
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
238
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
239
def mode_kind(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
240
    """Determine the Bazaar inventory kind based on Unix file mode."""
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
241
    entry_kind = (mode & 0700000) / 0100000
242
    if entry_kind == 0:
243
        return 'directory'
244
    elif entry_kind == 1:
245
        file_kind = (mode & 070000) / 010000
246
        if file_kind == 0:
247
            return 'file'
248
        elif file_kind == 2:
249
            return 'symlink'
250
        elif file_kind == 6:
251
            return 'tree-reference'
252
        else:
253
            raise AssertionError(
254
                "Unknown file kind %d, perms=%o." % (file_kind, mode,))
255
    else:
256
        raise AssertionError(
257
            "Unknown kind, perms=%r." % (mode,))
258
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
259
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
260
def entry_mode(entry):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
261
    """Determine the git file mode for an inventory entry."""
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
262
    if entry.kind == 'directory':
263
        return stat.S_IFDIR
264
    elif entry.kind == 'symlink':
265
        return stat.S_IFLNK
266
    elif entry.kind == 'file':
267
        mode = stat.S_IFREG | 0644
268
        if entry.executable:
269
            mode |= 0111
270
        return mode
271
    else:
272
        raise AssertionError
273
274
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
275
def directory_to_tree(entry, lookup_ie_sha1, unusual_modes):
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
276
    from dulwich.objects import Tree
277
    tree = Tree()
278
    for name in sorted(entry.children.keys()):
279
        ie = entry.children[name]
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
280
        try:
281
            mode = unusual_modes[ie.file_id]
282
        except KeyError:
283
            mode = entry_mode(ie)
284
        tree.add(mode, name.encode("utf-8"), lookup_ie_sha1(ie))
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
285
    tree.serialize()
286
    return tree
287
288
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
289
def extract_unusual_modes(rev):
290
    try:
291
        foreign_revid, mapping = mapping_registry.parse_revision_id(rev.revision_id)
292
    except errors.InvalidRevisionId:
293
        return {}
294
    else:
295
        return mapping.export_unusual_file_modes(rev)
296
297
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
298
def inventory_to_tree_and_blobs(inventory, texts, mapping, unusual_modes, cur=None):
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
299
    """Convert a Bazaar tree to a Git tree.
300
301
    :return: Yields tuples with object sha1, object and path
302
    """
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
303
    from dulwich.objects import Tree
0.200.213 by Jelmer Vernooij
Move functions to mapping.
304
    import stat
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
305
    stack = []
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
306
    if cur is None:
307
        cur = ""
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
308
    tree = Tree()
309
0.200.220 by Jelmer Vernooij
yield the right path for the tree root.
310
    # stack contains the set of trees that we haven't 
311
    # finished constructing
0.200.349 by Jelmer Vernooij
Specify inventory and texts to inventory_to_tree_and_blobs rather than full repository.
312
    for path, entry in inventory.iter_entries():
0.200.356 by Jelmer Vernooij
Fix nasty bug in inventory_to_trees_and_blobs
313
        while stack and not path.startswith(osutils.pathjoin(cur, "")):
314
            # We've hit a file that's not a child of the previous path
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
315
            tree.serialize()
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
316
            sha = tree.id
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
317
            yield sha, tree, cur.encode("utf-8")
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
318
            mode = unusual_modes.get(cur.encode("utf-8"), stat.S_IFDIR)
319
            t = (mode, urlutils.basename(cur).encode('UTF-8'), sha)
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
320
            cur, tree = stack.pop()
321
            tree.add(*t)
322
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
323
        if entry.kind == "directory":
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
324
            stack.append((cur, tree))
325
            cur = path
326
            tree = Tree()
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
327
        else:
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
328
            if entry.kind == "file":
329
                blob = text_to_blob(texts, entry)
330
            elif entry.kind == "symlink":
331
                blob = symlink_to_blob(entry)
332
            else:
333
                raise AssertionError("Unknown kind %s" % entry.kind)
334
            sha = blob.id
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
335
            yield sha, blob, path.encode("utf-8")
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
336
            name = urlutils.basename(path).encode("utf-8")
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
337
            mode = unusual_modes.get(path.encode("utf-8"), entry_mode(entry))
338
            tree.add(mode, name, sha)
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
339
340
    while len(stack) > 1:
341
        tree.serialize()
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
342
        sha = tree.id
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
343
        yield sha, tree, cur.encode("utf-8")
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
344
        mode = unusual_modes.get(cur.encode('utf-8'), stat.S_IFDIR)
345
        t = (mode, urlutils.basename(cur).encode('UTF-8'), sha)
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
346
        cur, tree = stack.pop()
347
        tree.add(*t)
348
349
    tree.serialize()
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
350
    yield tree.id, tree, cur.encode("utf-8")
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
351
352
353
def revision_to_commit(rev, tree_sha, parent_lookup):
354
    """Turn a Bazaar revision in to a Git commit
355
356
    :param tree_sha: Tree sha for the commit
357
    :param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
358
    :return dulwich.objects.Commit represent the revision:
359
    """
360
    from dulwich.objects import Commit
361
    commit = Commit()
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
362
    commit.tree = tree_sha
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
363
    for p in rev.parent_ids:
0.200.222 by Jelmer Vernooij
Dpush works \o/
364
        git_p = parent_lookup(p)
365
        if git_p is not None:
0.200.281 by Jelmer Vernooij
Add extra assert to make sure we don't write invalid parents.
366
            assert len(git_p) == 40, "unexpected length for %r" % git_p
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
367
            commit.parents.append(git_p)
368
    commit.message = rev.message.encode("utf-8")
369
    commit.committer = fix_person_identifier(rev.committer.encode("utf-8"))
370
    commit.author = fix_person_identifier(rev.get_apparent_authors()[0].encode("utf-8"))
371
    commit.commit_time = long(rev.timestamp)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
372
    if 'author-timestamp' in rev.properties:
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
373
        commit.author_time = long(rev.properties['author-timestamp'])
0.200.350 by Jelmer Vernooij
Support author_time
374
    else:
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
375
        commit.author_time = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
376
    commit.commit_timezone = rev.timezone
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
377
    if 'author-timezone' in rev.properties:
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
378
        commit.author_timezone = int(rev.properties['author-timezone'])
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
379
    else:
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
380
        commit.author_timezone = commit.commit_timezone 
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
381
    return commit