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

https://launchpad.net/bugs/613502
Fix regression in git-import.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
1
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
21
21
from dulwich.index import (
22
22
    commit_tree,
23
23
    )
 
24
import os
24
25
import stat
25
26
 
26
27
from bzrlib.repository import (
28
29
    )
29
30
 
30
31
from dulwich.objects import (
 
32
    S_IFGITLINK,
31
33
    Blob,
32
34
    Commit,
33
 
    Tree,
 
35
    )
 
36
 
 
37
 
 
38
from bzrlib.plugins.git.mapping import (
 
39
    entry_mode,
34
40
    )
35
41
 
36
42
 
38
44
 
39
45
    def __init__(self, *args, **kwargs):
40
46
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
 
47
        self.store = self.repository._git.object_store
41
48
        self._blobs = {}
42
49
 
 
50
    def record_entry_contents(self, ie, parent_invs, path, tree,
 
51
        content_summary):
 
52
        raise NotImplementedError(self.record_entry_contents)
 
53
 
43
54
    def record_delete(self, path, file_id):
44
55
        self._blobs[path] = None
 
56
        self._any_changes = True
45
57
 
46
58
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
47
59
        index = getattr(workingtree, "index", None)
58
70
                blob = Blob()
59
71
                blob.data = workingtree.get_file_text(file_id, path)
60
72
                return blob.id
61
 
        for (file_id, path, changed_content, versioned, parent, name, kind, 
 
73
        for (file_id, path, changed_content, versioned, parent, name, kind,
62
74
             executable) in iter_changes:
63
75
            if kind[1] in ("directory",):
64
76
                if kind[0] in ("file", "symlink"):
67
79
            if path[1] is None:
68
80
                self.record_delete(path[0], file_id)
69
81
                continue
70
 
            if kind == "file":
 
82
            if kind[1] == "file":
71
83
                mode = stat.S_IFREG
72
84
                sha = text_sha1(path[1], file_id)
73
 
            else:
 
85
            elif kind[1] == "symlink":
74
86
                mode = stat.S_IFLNK
75
87
                sha = link_sha1(path[1], file_id)
76
 
            if executable:
 
88
            elif kind[1] == "tree-reference":
 
89
                mode = S_IFGITLINK
 
90
                sha = "FIXME"
 
91
            else:
 
92
                raise AssertionError("Unknown kind %r" % kind[1])
 
93
            if executable[1]:
77
94
                mode |= 0111
 
95
            self._any_changes = True
78
96
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
79
 
            yield file_id, path, (None, None)
80
 
        # FIXME: Import all blobs not set yet, and eliminate blobs set to None
 
97
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
 
98
            yield file_id, path[1], (file_sha1, os.lstat(workingtree.abspath(path[1])))
 
99
        # Fill in entries that were not changed
 
100
        basis_tree = workingtree.basis_tree()
 
101
        assert basis_tree.get_revision_id() == basis_revid
 
102
        for path, entry in basis_tree.iter_entries_by_dir():
 
103
            if entry.kind not in ("file", "symlink"):
 
104
                continue
 
105
            if not path in self._blobs:
 
106
                blob = Blob()
 
107
                if entry.kind == "symlink":
 
108
                    blob.data = basis_tree.get_symlink_target(entry.file_id)
 
109
                else:
 
110
                    blob.data = basis_tree.get_file_text(entry.file_id)
 
111
                self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
 
112
 
 
113
    def finish_inventory(self):
 
114
        # eliminate blobs that were removed
 
115
        for path, entry in iter(self._blobs.items()):
 
116
            if entry is None:
 
117
                del self._blobs[path]
 
118
 
 
119
    def _iterblobs(self):
 
120
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
81
121
 
82
122
    def commit(self, message):
83
123
        c = Commit()
84
 
        c.tree = commit_tree(self.repository._git.object_store, self._blobs)
 
124
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
 
125
        c.tree = commit_tree(self.store, self._iterblobs())
85
126
        c.committer = self._committer
86
127
        c.author = self._revprops.get('author', self._committer)
87
 
        c.commit_timestamp = self._timestamp
88
 
        c.author_timestamp = self._timestamp
 
128
        c.commit_time = int(self._timestamp)
 
129
        c.author_time = int(self._timestamp)
89
130
        c.commit_timezone = self._timezone
90
131
        c.author_timezone = self._timezone
 
132
        c.encoding = 'utf-8'
91
133
        c.message = message.encode("utf-8")
92
 
        self.repository._git.object_store.add_object(c)
93
 
        return self.repository.mapping.revision_id_foreign_to_bzr(c.id)
 
134
        self.store.add_object(c)
 
135
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
 
136
        self.repository.commit_write_group()
 
137
        return self._new_revision_id