/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,
0.200.1762 by Jelmer Vernooij
Fix mode handling.
52
    object_mode,
0.200.1711 by Jelmer Vernooij
Fix up identifiers if no fullname is set.
53
    fix_person_identifier,
0.200.510 by Jelmer Vernooij
Fill in old entries.
54
    )
55
56
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
57
class GitCommitBuilder(CommitBuilder):
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
58
    """Commit builder for Git repositories."""
59
60
    supports_record_entry_contents = False
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
61
62
    def __init__(self, *args, **kwargs):
63
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
0.200.1667 by Jelmer Vernooij
Set random_revid and _new_revision_id properties.
64
        self.random_revid = True
0.200.1247 by Jelmer Vernooij
Validate revprops during commit.
65
        self._validate_revprops(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
66
        self.store = self.repository._git.object_store
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
67
        self._blobs = {}
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
68
        self._inv_delta = []
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
69
        self._any_changes = False
0.200.1328 by Jelmer Vernooij
More test fixes.
70
        self._override_fileids = {}
71
        self._mapping = self.repository.get_mapping()
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
72
73
    def any_changes(self):
74
        return self._any_changes
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
75
76
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
0.200.1544 by Jelmer Vernooij
Hackishly fix tree references.
77
        def treeref_sha1(path, file_id):
78
            return Repo.open(os.path.join(workingtree.basedir, path)).head()
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
79
        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.
80
        for (file_id, path, changed_content, versioned, parent, name, kind,
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
81
             executable) in iter_changes:
82
            if kind[1] in ("directory",):
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
83
                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.
84
                if kind[0] in ("file", "symlink"):
0.200.1665 by Jelmer Vernooij
Rename _matchingbzrdir to _matchingcnotroldir.
85
                    self._blobs[path[0].encode("utf-8")] = None
0.200.1719 by Jelmer Vernooij
Fix pointless test.
86
                    self._any_changes = True
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
87
                if path[1] == "":
88
                    seen_root = True
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
89
                continue
0.200.1719 by Jelmer Vernooij
Fix pointless test.
90
            self._any_changes = True
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
91
            if path[1] is None:
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
92
                self._inv_delta.append((path[0], path[1], file_id, None))
0.200.1665 by Jelmer Vernooij
Rename _matchingbzrdir to _matchingcnotroldir.
93
                self._blobs[path[0].encode("utf-8")] = None
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
94
                continue
0.200.1706 by Jelmer Vernooij
Improve KeyError.
95
            try:
96
                entry_kls = entry_factory[kind[1]]
97
            except KeyError:
98
                raise KeyError("unknown kind %s" % kind[1])
99
            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.
100
            if kind[1] == "file":
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
101
                entry.executable = executable[1]
102
                blob = Blob()
103
                blob.data = workingtree.get_file_text(path[1], file_id)
104
                entry.text_size = len(blob.data)
105
                entry.text_sha1 = osutils.sha_string(blob.data)
106
                self.store.add_object(blob)
107
                sha = blob.id
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
108
            elif kind[1] == "symlink":
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
109
                symlink_target = workingtree.get_symlink_target(path[1], file_id)
110
                blob = Blob()
111
                blob.data = symlink_target.encode("utf-8")
112
                self.store.add_object(blob)
113
                sha = blob.id
114
                entry.symlink_target = symlink_target
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
115
            elif kind[1] == "tree-reference":
0.200.1544 by Jelmer Vernooij
Hackishly fix tree references.
116
                sha = treeref_sha1(path[1], file_id)
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
117
                reference_revision = workingtree.get_reference_revision(path[1], file_id)
118
                entry.reference_revision = reference_revision
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
119
            else:
120
                raise AssertionError("Unknown kind %r" % kind[1])
0.200.1762 by Jelmer Vernooij
Fix mode handling.
121
            mode = object_mode(kind[1], executable[1])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
122
            self._inv_delta.append((path[0], path[1], file_id, entry))
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.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
125
            file_sha1 = workingtree.get_file_sha1(path[1], file_id)
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.1665 by Jelmer Vernooij
Rename _matchingbzrdir to _matchingcnotroldir.
129
                    self._blobs[path[0].encode("utf-8")] = None
0.200.1256 by Jelmer Vernooij
Cope with files disappearing during commit.
130
                continue
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
131
            _, st = workingtree.get_file_with_stat(path[1], file_id)
0.200.1092 by Jelmer Vernooij
Avoid dependency on os.lstat.
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.1715 by Jelmer Vernooij
Fix some more tests.
146
            assert isinstance(path, unicode)
0.200.1544 by Jelmer Vernooij
Hackishly fix tree references.
147
            if entry.kind not in ("file", "symlink", "tree-reference"):
0.200.510 by Jelmer Vernooij
Fill in old entries.
148
                continue
149
            if not path in self._blobs:
150
                if entry.kind == "symlink":
0.200.1544 by Jelmer Vernooij
Hackishly fix tree references.
151
                    blob = Blob()
0.200.1715 by Jelmer Vernooij
Fix some more tests.
152
                    blob.data = basis_tree.get_symlink_target(path, entry.file_id).encode('utf-8')
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.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
156
                    blob.data = basis_tree.get_file_text(path, entry.file_id)
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.1762 by Jelmer Vernooij
Fix mode handling.
160
                    self._blobs[path.encode("utf-8")] = (mode, sha)
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)
0.320.1 by Jelmer Vernooij
Don't set file ids unless different from default.
176
            else:
177
                fileid_blob = None
178
            if fileid_blob is not None:
0.200.1328 by Jelmer Vernooij
More test fixes.
179
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0644, fileid_blob.id)
180
            else:
181
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
0.200.1145 by Jelmer Vernooij
reset new_inventory after record_iter_changes
182
        self.new_inventory = None
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
183
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
184
    def update_basis(self, tree):
185
        # Nothing to do here
186
        pass
0.200.1230 by Jelmer Vernooij
Provide CommitBuilder.get_basis_delta.
187
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
188
    def finish_inventory(self):
0.200.510 by Jelmer Vernooij
Fill in old entries.
189
        # eliminate blobs that were removed
0.200.998 by Jelmer Vernooij
Don't modify dictionary during iteration.
190
        for path, entry in iter(self._blobs.items()):
0.200.510 by Jelmer Vernooij
Fill in old entries.
191
            if entry is None:
192
                del self._blobs[path]
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
193
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
194
    def _iterblobs(self):
195
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
196
0.200.391 by Jelmer Vernooij
Fix syntax error.
197
    def commit(self, message):
0.200.1177 by Jelmer Vernooij
Check message for validity.
198
        self._validate_unicode_text(message, 'commit message')
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
199
        c = Commit()
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
200
        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.
201
        c.tree = commit_tree(self.store, self._iterblobs())
0.200.1747 by Jelmer Vernooij
Fix some revprop failures.
202
        c.encoding = self._revprops.pop('git-explicit-encoding', 'utf-8')
0.200.1711 by Jelmer Vernooij
Fix up identifiers if no fullname is set.
203
        c.committer = fix_person_identifier(self._committer.encode(c.encoding))
204
        c.author = fix_person_identifier(self._revprops.pop('author', self._committer).encode(c.encoding))
0.200.1709 by Jelmer Vernooij
Avoid encoding commit supplements.
205
        if self._revprops:
206
            raise NotImplementedError(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
207
        c.commit_time = int(self._timestamp)
208
        c.author_time = int(self._timestamp)
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
209
        c.commit_timezone = self._timezone
210
        c.author_timezone = self._timezone
0.200.1651 by Jelmer Vernooij
Encode committer/author.
211
        c.message = message.encode(c.encoding)
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
212
        assert len(c.id) == 40
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
213
        self.store.add_object(c)
0.200.702 by Jelmer Vernooij
properly commit write group
214
        self.repository.commit_write_group()
0.200.1667 by Jelmer Vernooij
Set random_revid and _new_revision_id properties.
215
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
216
        return self._new_revision_id
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
217
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
218
    def abort(self):
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
219
        self.repository.abort_write_group()
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
220
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
221
    def revision_tree(self):
222
        return self.repository.revision_tree(self._new_revision_id)
0.200.1678 by Jelmer Vernooij
Fix tests.
223
224
    def get_basis_delta(self):
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
225
        for (oldpath, newpath, file_id, entry) in self._inv_delta:
226
            if entry is not None:
227
                entry.revision = self._new_revision_id
228
        return self._inv_delta
229
230
    def update_basis_by_delta(self, revid, delta):
231
        pass