/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

Formatting fixes, specify path to a couple more functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
 
1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
"""Support for committing in native Git working trees."""
 
19
 
 
20
 
 
21
from dulwich.index import (
 
22
    commit_tree,
 
23
    )
 
24
import stat
 
25
 
 
26
from bzrlib import (
 
27
    revision as _mod_revision,
 
28
    )
 
29
from bzrlib.errors import (
 
30
    RootMissing,
 
31
    )
 
32
from bzrlib.repository import (
 
33
    CommitBuilder,
 
34
    )
 
35
 
 
36
from dulwich.objects import (
 
37
    S_IFGITLINK,
 
38
    Blob,
 
39
    Commit,
 
40
    )
 
41
 
 
42
 
 
43
from bzrlib.plugins.git.mapping import (
 
44
    entry_mode,
 
45
    )
 
46
 
 
47
 
 
48
class GitCommitBuilder(CommitBuilder):
 
49
    """Commit builder for Git repositories."""
 
50
 
 
51
    supports_record_entry_contents = False
 
52
 
 
53
    def __init__(self, *args, **kwargs):
 
54
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
 
55
        self._validate_revprops(self._revprops)
 
56
        self.store = self.repository._git.object_store
 
57
        self._blobs = {}
 
58
        self._any_changes = False
 
59
        self._will_record_deletes = False
 
60
 
 
61
    def any_changes(self):
 
62
        return self._any_changes
 
63
 
 
64
    def record_entry_contents(self, ie, parent_invs, path, tree,
 
65
        content_summary):
 
66
        raise NotImplementedError(self.record_entry_contents)
 
67
 
 
68
    def record_delete(self, path, file_id):
 
69
        self._blobs[path] = None
 
70
        self._any_changes = True
 
71
 
 
72
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
 
73
        index = getattr(workingtree, "index", None)
 
74
        if index is not None:
 
75
            def index_sha1(path, file_id):
 
76
                return index.get_sha1(path.encode("utf-8"))
 
77
            text_sha1 = link_sha1 = index_sha1
 
78
        else:
 
79
            def link_sha1(path, file_id):
 
80
                blob = Blob()
 
81
                blob.data = workingtree.get_symlink_target(file_id, path)
 
82
                return blob.id
 
83
            def text_sha1(path, file_id):
 
84
                blob = Blob()
 
85
                blob.data = workingtree.get_file_text(file_id, path)
 
86
                return blob.id
 
87
        seen_root = False
 
88
        for (file_id, path, changed_content, versioned, parent, name, kind,
 
89
             executable) in iter_changes:
 
90
            if kind[1] in ("directory",):
 
91
                if kind[0] in ("file", "symlink"):
 
92
                    self.record_delete(path[0], file_id)
 
93
                if path[1] == "":
 
94
                    seen_root = True
 
95
                continue
 
96
            if path[1] is None:
 
97
                self.record_delete(path[0], file_id)
 
98
                continue
 
99
            if kind[1] == "file":
 
100
                mode = stat.S_IFREG
 
101
                sha = text_sha1(path[1], file_id)
 
102
            elif kind[1] == "symlink":
 
103
                mode = stat.S_IFLNK
 
104
                sha = link_sha1(path[1], file_id)
 
105
            elif kind[1] == "tree-reference":
 
106
                mode = S_IFGITLINK
 
107
                sha = "FIXME" # FIXME
 
108
            else:
 
109
                raise AssertionError("Unknown kind %r" % kind[1])
 
110
            if executable[1]:
 
111
                mode |= 0111
 
112
            self._any_changes = True
 
113
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
 
114
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
 
115
            if file_sha1 is None:
 
116
                # File no longer exists
 
117
                if path[0] is not None:
 
118
                    self.record_delete(path[0], file_id)
 
119
                continue
 
120
            _, st = workingtree.get_file_with_stat(file_id, path[1])
 
121
            yield file_id, path[1], (file_sha1, st)
 
122
        if not seen_root and len(self.parents) == 0:
 
123
            raise RootMissing()
 
124
        if getattr(workingtree, "basis_tree", False):
 
125
            basis_tree = workingtree.basis_tree()
 
126
        else:
 
127
            if len(self.parents) == 0:
 
128
                basis_revid = _mod_revision.NULL_REVISION
 
129
            else:
 
130
                basis_revid = self.parents[0]
 
131
            basis_tree = self.repository.revision_tree(basis_revid)
 
132
        # Fill in entries that were not changed
 
133
        for path, entry in basis_tree.iter_entries_by_dir():
 
134
            if entry.kind not in ("file", "symlink"):
 
135
                continue
 
136
            if not path in self._blobs:
 
137
                blob = Blob()
 
138
                if entry.kind == "symlink":
 
139
                    blob.data = basis_tree.get_symlink_target(entry.file_id,
 
140
                        path)
 
141
                else:
 
142
                    blob.data = basis_tree.get_file_text(entry.file_id, path)
 
143
                self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
 
144
        self.new_inventory = None
 
145
 
 
146
    def get_basis_delta(self):
 
147
        if not self._will_record_deletes:
 
148
            raise AssertionError
 
149
        # FIXME
 
150
        return []
 
151
 
 
152
    def finish_inventory(self):
 
153
        # eliminate blobs that were removed
 
154
        for path, entry in iter(self._blobs.items()):
 
155
            if entry is None:
 
156
                del self._blobs[path]
 
157
 
 
158
    def _iterblobs(self):
 
159
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
 
160
 
 
161
    def commit(self, message):
 
162
        self._validate_unicode_text(message, 'commit message')
 
163
        c = Commit()
 
164
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
 
165
        c.tree = commit_tree(self.store, self._iterblobs())
 
166
        c.committer = self._committer
 
167
        c.author = self._revprops.get('author', self._committer)
 
168
        c.commit_time = int(self._timestamp)
 
169
        c.author_time = int(self._timestamp)
 
170
        c.commit_timezone = self._timezone
 
171
        c.author_timezone = self._timezone
 
172
        c.encoding = 'utf-8'
 
173
        c.message = message.encode("utf-8")
 
174
        self.store.add_object(c)
 
175
        assert len(c.id) == 40
 
176
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
 
177
        self.repository.commit_write_group()
 
178
        return self._new_revision_id
 
179
 
 
180
    def abort(self):
 
181
        self.repository.abort_write_group()
 
182
 
 
183
    def will_record_deletes(self):
 
184
        self._will_record_deletes = True
 
185
 
 
186
    def revision_tree(self):
 
187
        return self.repository.revision_tree(self._new_revision_id)