/brz/remove-bazaar

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