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