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