/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.910 by Jelmer Vernooij
update copyright years
1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
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
0.200.405 by Jelmer Vernooij
More work on commit.
17
18
"""Support for committing in native Git working trees."""
19
20
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
21
from dulwich.index import (
22
    commit_tree,
23
    )
0.200.405 by Jelmer Vernooij
More work on commit.
24
import stat
25
0.200.1217 by Jelmer Vernooij
Support committing from a tree that does not have a basis tree.
26
from bzrlib import (
27
    revision as _mod_revision,
28
    )
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
29
from bzrlib.errors import (
30
    RootMissing,
31
    )
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
32
from bzrlib.repository import (
33
    CommitBuilder,
34
    )
35
36
from dulwich.objects import (
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
37
    S_IFGITLINK,
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
38
    Blob,
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
39
    Commit,
40
    )
41
42
0.200.510 by Jelmer Vernooij
Fill in old entries.
43
from bzrlib.plugins.git.mapping import (
44
    entry_mode,
45
    )
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
46
from bzrlib.plugins.git.roundtrip import (
47
    CommitSupplement,
48
    inject_bzr_metadata,
49
    )
0.200.510 by Jelmer Vernooij
Fill in old entries.
50
51
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
52
class GitCommitBuilder(CommitBuilder):
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
53
    """Commit builder for Git repositories."""
54
55
    supports_record_entry_contents = False
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
56
57
    def __init__(self, *args, **kwargs):
58
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
0.200.1247 by Jelmer Vernooij
Validate revprops during commit.
59
        self._validate_revprops(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
60
        self.store = self.repository._git.object_store
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
61
        self._blobs = {}
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
62
        self._any_changes = False
0.200.1245 by Jelmer Vernooij
Raise AssertionError in GitCommitBuilder.get_basis_delta if deletes won't be recorded.
63
        self._will_record_deletes = False
0.200.1328 by Jelmer Vernooij
More test fixes.
64
        self._override_fileids = {}
65
        self._mapping = self.repository.get_mapping()
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
66
67
    def any_changes(self):
68
        return self._any_changes
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
69
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
70
    def record_entry_contents(self, ie, parent_invs, path, tree,
71
        content_summary):
0.200.668 by Jelmer Vernooij
Fix some places where we were way too much memory for repositories with a large number of entries in the inventory and a large number of revisions.
72
        raise NotImplementedError(self.record_entry_contents)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
73
0.200.1366 by Jelmer Vernooij
Support deletion of directories.
74
    def record_delete(self, kind, path, file_id):
0.200.1351 by Jelmer Vernooij
Fix some types.
75
        assert type(path) == str
0.200.1366 by Jelmer Vernooij
Support deletion of directories.
76
        if kind != 'directory':
77
            self._override_fileids[path] = None
78
            self._blobs[path] = None
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
79
        self._any_changes = True
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
80
81
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
82
        index = getattr(workingtree, "index", None)
83
        if index is not None:
84
            def index_sha1(path, file_id):
85
                return index.get_sha1(path.encode("utf-8"))
86
            text_sha1 = link_sha1 = index_sha1
87
        else:
88
            def link_sha1(path, file_id):
89
                blob = Blob()
0.200.1307 by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions.
90
                blob.data = workingtree.get_symlink_target(file_id, path)
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
91
                return blob.id
92
            def text_sha1(path, file_id):
93
                blob = Blob()
94
                blob.data = workingtree.get_file_text(file_id, path)
95
                return blob.id
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
96
        seen_root = False
0.200.668 by Jelmer Vernooij
Fix some places where we were way too much memory for repositories with a large number of entries in the inventory and a large number of revisions.
97
        for (file_id, path, changed_content, versioned, parent, name, kind,
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
98
             executable) in iter_changes:
99
            if kind[1] in ("directory",):
100
                if kind[0] in ("file", "symlink"):
0.200.1366 by Jelmer Vernooij
Support deletion of directories.
101
                    self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
102
                if path[1] == "":
103
                    seen_root = True
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
104
                continue
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
105
            if path[1] is None:
0.200.1366 by Jelmer Vernooij
Support deletion of directories.
106
                self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
107
                continue
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
108
            if kind[1] == "file":
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
109
                mode = stat.S_IFREG
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
110
                sha = text_sha1(path[1], file_id)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
111
            elif kind[1] == "symlink":
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
112
                mode = stat.S_IFLNK
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
113
                sha = link_sha1(path[1], file_id)
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
114
            elif kind[1] == "tree-reference":
115
                mode = S_IFGITLINK
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
116
                sha = "FIXME" # FIXME
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
117
            else:
118
                raise AssertionError("Unknown kind %r" % kind[1])
0.200.523 by Jelmer Vernooij
Fix undefined error.
119
            if executable[1]:
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
120
                mode |= 0111
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
121
            self._any_changes = True
0.200.1348 by Jelmer Vernooij
Fix handling of file id map.
122
            encoded_new_path = path[1].encode("utf-8")
123
            self._blobs[encoded_new_path] = (mode, sha)
0.200.700 by Jelmer Vernooij
Support committing to a git branch from a bzr working tree.
124
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
0.200.1256 by Jelmer Vernooij
Cope with files disappearing during commit.
125
            if file_sha1 is None:
126
                # File no longer exists
127
                if path[0] is not None:
0.200.1366 by Jelmer Vernooij
Support deletion of directories.
128
                    self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
0.200.1256 by Jelmer Vernooij
Cope with files disappearing during commit.
129
                continue
0.200.1092 by Jelmer Vernooij
Avoid dependency on os.lstat.
130
            _, st = workingtree.get_file_with_stat(file_id, path[1])
131
            yield file_id, path[1], (file_sha1, st)
0.200.1348 by Jelmer Vernooij
Fix handling of file id map.
132
            self._override_fileids[encoded_new_path] = file_id
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
133
        if not seen_root and len(self.parents) == 0:
134
            raise RootMissing()
0.200.1217 by Jelmer Vernooij
Support committing from a tree that does not have a basis tree.
135
        if getattr(workingtree, "basis_tree", False):
136
            basis_tree = workingtree.basis_tree()
137
        else:
138
            if len(self.parents) == 0:
139
                basis_revid = _mod_revision.NULL_REVISION
140
            else:
141
                basis_revid = self.parents[0]
142
            basis_tree = self.repository.revision_tree(basis_revid)
0.200.510 by Jelmer Vernooij
Fill in old entries.
143
        # Fill in entries that were not changed
144
        for path, entry in basis_tree.iter_entries_by_dir():
145
            if entry.kind not in ("file", "symlink"):
146
                continue
147
            if not path in self._blobs:
148
                blob = Blob()
149
                if entry.kind == "symlink":
0.200.1307 by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions.
150
                    blob.data = basis_tree.get_symlink_target(entry.file_id,
151
                        path)
0.200.510 by Jelmer Vernooij
Fill in old entries.
152
                else:
0.200.1307 by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions.
153
                    blob.data = basis_tree.get_file_text(entry.file_id, path)
0.200.510 by Jelmer Vernooij
Fill in old entries.
154
                self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
0.200.1329 by Jelmer Vernooij
Fix more tests.
155
        if not self._lossy and self._mapping.BZR_FILE_IDS_FILE is not None:
0.200.1328 by Jelmer Vernooij
More test fixes.
156
            try:
157
                fileid_map = dict(basis_tree._fileid_map.file_ids)
158
            except AttributeError:
159
                fileid_map = {}
0.200.1348 by Jelmer Vernooij
Fix handling of file id map.
160
            for path, file_id in self._override_fileids.iteritems():
161
                assert type(path) == str
162
                if file_id is None:
163
                    del fileid_map[path]
164
                else:
165
                    assert type(file_id) == str
166
                    fileid_map[path] = file_id
0.200.1328 by Jelmer Vernooij
More test fixes.
167
            if fileid_map:
168
                fileid_blob = self._mapping.export_fileid_map(fileid_map)
169
                self.store.add_object(fileid_blob)
170
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0644, fileid_blob.id)
171
            else:
172
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
0.200.1145 by Jelmer Vernooij
reset new_inventory after record_iter_changes
173
        self.new_inventory = None
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
174
0.200.1230 by Jelmer Vernooij
Provide CommitBuilder.get_basis_delta.
175
    def get_basis_delta(self):
0.200.1245 by Jelmer Vernooij
Raise AssertionError in GitCommitBuilder.get_basis_delta if deletes won't be recorded.
176
        if not self._will_record_deletes:
177
            raise AssertionError
0.200.1230 by Jelmer Vernooij
Provide CommitBuilder.get_basis_delta.
178
        # FIXME
0.200.1235 by Jelmer Vernooij
Return dummy basis delta, for now.
179
        return []
0.200.1230 by Jelmer Vernooij
Provide CommitBuilder.get_basis_delta.
180
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
181
    def finish_inventory(self):
0.200.510 by Jelmer Vernooij
Fill in old entries.
182
        # eliminate blobs that were removed
0.200.998 by Jelmer Vernooij
Don't modify dictionary during iteration.
183
        for path, entry in iter(self._blobs.items()):
0.200.510 by Jelmer Vernooij
Fill in old entries.
184
            if entry is None:
185
                del self._blobs[path]
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
186
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
187
    def _iterblobs(self):
188
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
189
0.200.391 by Jelmer Vernooij
Fix syntax error.
190
    def commit(self, message):
0.200.1177 by Jelmer Vernooij
Check message for validity.
191
        self._validate_unicode_text(message, 'commit message')
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
192
        c = Commit()
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
193
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
194
        c.tree = commit_tree(self.store, self._iterblobs())
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
195
        c.committer = self._committer
196
        c.author = self._revprops.get('author', self._committer)
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
197
        if c.author != c.committer:
198
            self._revprops.remove("author")
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
199
        c.commit_time = int(self._timestamp)
200
        c.author_time = int(self._timestamp)
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
201
        c.commit_timezone = self._timezone
202
        c.author_timezone = self._timezone
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
203
        c.encoding = 'utf-8'
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
204
        c.message = message.encode("utf-8")
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
205
        if not self._lossy:
206
            commit_supplement = CommitSupplement()
207
            commit_supplement.revision_id = self._new_revision_id
208
            commit_supplement.properties = self._revprops
209
            commit_supplement.explicit_parent_ids = self.parents
210
            if commit_supplement:
211
                c.message = inject_bzr_metadata(c.message, commit_supplement, "utf-8")
212
213
        assert len(c.id) == 40
214
        if self._new_revision_id is None:
0.200.1328 by Jelmer Vernooij
More test fixes.
215
            self._new_revision_id = self.mapping.revision_id_foreign_to_bzr(c.id)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
216
        self.store.add_object(c)
0.200.702 by Jelmer Vernooij
properly commit write group
217
        self.repository.commit_write_group()
218
        return self._new_revision_id
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
219
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
220
    def abort(self):
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
221
        self.repository.abort_write_group()
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
222
0.200.1227 by Jelmer Vernooij
Implement CommitBuilder.will_record_deletes.
223
    def will_record_deletes(self):
0.200.1245 by Jelmer Vernooij
Raise AssertionError in GitCommitBuilder.get_basis_delta if deletes won't be recorded.
224
        self._will_record_deletes = True
0.200.1227 by Jelmer Vernooij
Implement CommitBuilder.will_record_deletes.
225
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
226
    def revision_tree(self):
227
        return self.repository.revision_tree(self._new_revision_id)