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