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