/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.405 by Jelmer Vernooij
More work on commit.
25
import stat
26
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
27
from .. import (
7206.2.1 by Jelmer Vernooij
Add support for --fixes in Git repositories.
28
    bugtracker,
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
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
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
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
39
from ..repository import (
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
40
    CommitBuilder,
41
    )
6986.2.3 by Jelmer Vernooij
Merge trunk
42
from ..sixish import (
7018.3.2 by Jelmer Vernooij
Fix some git tests.
43
    viewitems,
44
    )
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
45
46
from dulwich.objects import (
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
47
    Blob,
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
48
    Commit,
49
    )
0.429.10 by Jelmer Vernooij
use new read_submodule_head from dulwich.
50
from dulwich.index import read_submodule_head
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
51
52
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
53
from .mapping import (
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
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
62
    _fmt = ("Unable to store addition of file with custom file ids: "
63
            "%(file_ids)r")
0.333.1 by Jelmer Vernooij
Raise exception when unable to set file ids.
64
65
    def __init__(self, file_ids):
66
        BzrError.__init__(self)
67
        self.file_ids = file_ids
68
69
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
70
class GitCommitBuilder(CommitBuilder):
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
71
    """Commit builder for Git repositories."""
72
73
    supports_record_entry_contents = False
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
74
75
    def __init__(self, *args, **kwargs):
76
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
0.200.1667 by Jelmer Vernooij
Set random_revid and _new_revision_id properties.
77
        self.random_revid = True
0.200.1247 by Jelmer Vernooij
Validate revprops during commit.
78
        self._validate_revprops(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
79
        self.store = self.repository._git.object_store
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
80
        self._blobs = {}
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
81
        self._inv_delta = []
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
82
        self._any_changes = False
0.200.1328 by Jelmer Vernooij
More test fixes.
83
        self._override_fileids = {}
84
        self._mapping = self.repository.get_mapping()
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
85
86
    def any_changes(self):
87
        return self._any_changes
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
88
89
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
90
        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.
91
        for (file_id, path, changed_content, versioned, parent, name, kind,
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
92
             executable) in iter_changes:
93
            if kind[1] in ("directory",):
7143.15.2 by Jelmer Vernooij
Run autopep8.
94
                self._inv_delta.append(
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
95
                    (path[0], path[1], file_id, entry_factory[kind[1]](
96
                        file_id, name[1], parent[1])))
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
97
                if kind[0] in ("file", "symlink"):
0.200.1665 by Jelmer Vernooij
Rename _matchingbzrdir to _matchingcnotroldir.
98
                    self._blobs[path[0].encode("utf-8")] = None
0.200.1719 by Jelmer Vernooij
Fix pointless test.
99
                    self._any_changes = True
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
100
                if path[1] == "":
101
                    seen_root = True
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
102
                continue
0.200.1719 by Jelmer Vernooij
Fix pointless test.
103
            self._any_changes = True
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
104
            if path[1] is None:
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
105
                self._inv_delta.append((path[0], path[1], file_id, None))
0.200.1665 by Jelmer Vernooij
Rename _matchingbzrdir to _matchingcnotroldir.
106
                self._blobs[path[0].encode("utf-8")] = None
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
107
                continue
0.200.1706 by Jelmer Vernooij
Improve KeyError.
108
            try:
109
                entry_kls = entry_factory[kind[1]]
110
            except KeyError:
111
                raise KeyError("unknown kind %s" % kind[1])
112
            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.
113
            if kind[1] == "file":
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
114
                entry.executable = executable[1]
115
                blob = Blob()
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
116
                f, st = workingtree.get_file_with_stat(path[1])
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
117
                try:
118
                    blob.data = f.read()
119
                finally:
120
                    f.close()
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
121
                entry.text_size = len(blob.data)
122
                entry.text_sha1 = osutils.sha_string(blob.data)
123
                self.store.add_object(blob)
124
                sha = blob.id
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
125
            elif kind[1] == "symlink":
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
126
                symlink_target = workingtree.get_symlink_target(path[1])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
127
                blob = Blob()
128
                blob.data = symlink_target.encode("utf-8")
129
                self.store.add_object(blob)
130
                sha = blob.id
131
                entry.symlink_target = symlink_target
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
132
                st = None
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
133
            elif kind[1] == "tree-reference":
0.429.21 by Jelmer Vernooij
Simplify submodule handling.
134
                sha = read_submodule_head(workingtree.abspath(path[1]))
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
135
                reference_revision = workingtree.get_reference_revision(path[1])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
136
                entry.reference_revision = reference_revision
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
137
                st = None
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
138
            else:
139
                raise AssertionError("Unknown kind %r" % kind[1])
0.200.1762 by Jelmer Vernooij
Fix mode handling.
140
            mode = object_mode(kind[1], executable[1])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
141
            self._inv_delta.append((path[0], path[1], file_id, entry))
0.200.1348 by Jelmer Vernooij
Fix handling of file id map.
142
            encoded_new_path = path[1].encode("utf-8")
143
            self._blobs[encoded_new_path] = (mode, sha)
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
144
            if st is not None:
7206.6.1 by Jelmer Vernooij
Drop file_id from record_iter_changes return value.
145
                yield path[1], (entry.text_sha1, st)
0.333.1 by Jelmer Vernooij
Raise exception when unable to set file ids.
146
            if self._mapping.generate_file_id(encoded_new_path) != file_id:
147
                self._override_fileids[encoded_new_path] = file_id
148
            else:
149
                self._override_fileids[encoded_new_path] = None
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
150
        if not seen_root and len(self.parents) == 0:
151
            raise RootMissing()
0.200.1217 by Jelmer Vernooij
Support committing from a tree that does not have a basis tree.
152
        if getattr(workingtree, "basis_tree", False):
153
            basis_tree = workingtree.basis_tree()
154
        else:
155
            if len(self.parents) == 0:
156
                basis_revid = _mod_revision.NULL_REVISION
157
            else:
158
                basis_revid = self.parents[0]
159
            basis_tree = self.repository.revision_tree(basis_revid)
0.200.510 by Jelmer Vernooij
Fill in old entries.
160
        # Fill in entries that were not changed
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
161
        for entry in basis_tree._iter_tree_contents(include_trees=False):
162
            if entry.path in self._blobs:
0.200.510 by Jelmer Vernooij
Fill in old entries.
163
                continue
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
164
            self._blobs[entry.path] = (entry.mode, entry.sha)
0.333.1 by Jelmer Vernooij
Raise exception when unable to set file ids.
165
        if not self._lossy:
0.200.1328 by Jelmer Vernooij
More test fixes.
166
            try:
167
                fileid_map = dict(basis_tree._fileid_map.file_ids)
168
            except AttributeError:
169
                fileid_map = {}
7018.3.2 by Jelmer Vernooij
Fix some git tests.
170
            for path, file_id in viewitems(self._override_fileids):
171
                if not isinstance(path, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
172
                    raise TypeError(path)
0.200.1348 by Jelmer Vernooij
Fix handling of file id map.
173
                if file_id is None:
0.333.1 by Jelmer Vernooij
Raise exception when unable to set file ids.
174
                    if path in fileid_map:
175
                        del fileid_map[path]
0.200.1348 by Jelmer Vernooij
Fix handling of file id map.
176
                else:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
177
                    if not isinstance(file_id, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
178
                        raise TypeError(file_id)
0.200.1348 by Jelmer Vernooij
Fix handling of file id map.
179
                    fileid_map[path] = file_id
0.200.1328 by Jelmer Vernooij
More test fixes.
180
            if fileid_map:
181
                fileid_blob = self._mapping.export_fileid_map(fileid_map)
0.320.1 by Jelmer Vernooij
Don't set file ids unless different from default.
182
            else:
183
                fileid_blob = None
184
            if fileid_blob is not None:
0.333.1 by Jelmer Vernooij
Raise exception when unable to set file ids.
185
                if self._mapping.BZR_FILE_IDS_FILE is None:
186
                    raise SettingCustomFileIdsUnsupported(fileid_map)
187
                self.store.add_object(fileid_blob)
7143.15.2 by Jelmer Vernooij
Run autopep8.
188
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (
189
                    stat.S_IFREG | 0o644, fileid_blob.id)
0.200.1328 by Jelmer Vernooij
More test fixes.
190
            else:
191
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
0.200.1145 by Jelmer Vernooij
reset new_inventory after record_iter_changes
192
        self.new_inventory = None
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
193
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
194
    def update_basis(self, tree):
195
        # Nothing to do here
196
        pass
0.200.1230 by Jelmer Vernooij
Provide CommitBuilder.get_basis_delta.
197
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
198
    def finish_inventory(self):
0.200.510 by Jelmer Vernooij
Fill in old entries.
199
        # eliminate blobs that were removed
7143.15.2 by Jelmer Vernooij
Run autopep8.
200
        self._blobs = {k: v for (k, v) in viewitems(
201
            self._blobs) if v is not None}
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
202
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
203
    def _iterblobs(self):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
204
        return ((path, sha, mode) for (path, (mode, sha))
205
                in viewitems(self._blobs))
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
206
0.200.391 by Jelmer Vernooij
Fix syntax error.
207
    def commit(self, message):
0.200.1177 by Jelmer Vernooij
Check message for validity.
208
        self._validate_unicode_text(message, 'commit message')
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
209
        c = Commit()
7143.15.2 by Jelmer Vernooij
Run autopep8.
210
        c.parents = [self.repository.lookup_bzr_revision_id(
211
            revid)[0] for revid in self.parents]
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
212
        c.tree = commit_tree(self.store, self._iterblobs())
7018.3.2 by Jelmer Vernooij
Fix some git tests.
213
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
214
        c.encoding = encoding.encode('ascii')
215
        c.committer = fix_person_identifier(self._committer.encode(encoding))
7143.6.1 by Jelmer Vernooij
Support the 'authors' revprop when creating Git commits.
216
        try:
217
            author = self._revprops.pop('author')
218
        except KeyError:
219
            try:
220
                authors = self._revprops.pop('authors').splitlines()
221
            except KeyError:
222
                author = self._committer
223
            else:
224
                if len(authors) > 1:
225
                    raise Exception("Unable to convert multiple authors")
226
                elif len(authors) == 0:
227
                    author = self._committer
228
                else:
229
                    author = authors[0]
230
        c.author = fix_person_identifier(author.encode(encoding))
7206.2.2 by Jelmer Vernooij
Review comments.
231
        bugstext = self._revprops.pop('bugs', None)
232
        if bugstext is not None:
7206.2.1 by Jelmer Vernooij
Add support for --fixes in Git repositories.
233
            message += "\n"
234
            for url, status in bugtracker.decode_bug_urls(bugstext):
235
                if status == bugtracker.FIXED:
236
                    message += "Fixes: %s\n" % url
237
                elif status == bugtracker.RELATED:
238
                    message += "Bug: %s\n" % url
239
                else:
240
                    raise bugtracker.InvalidBugStatus(status)
0.200.1709 by Jelmer Vernooij
Avoid encoding commit supplements.
241
        if self._revprops:
242
            raise NotImplementedError(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
243
        c.commit_time = int(self._timestamp)
244
        c.author_time = int(self._timestamp)
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
245
        c.commit_timezone = self._timezone
246
        c.author_timezone = self._timezone
7018.3.2 by Jelmer Vernooij
Fix some git tests.
247
        c.message = message.encode(encoding)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
248
        if (self._config_stack.get('create_signatures') ==
249
                _mod_config.SIGN_ALWAYS):
0.386.1 by Jelmer Vernooij
Support signing commits.
250
            strategy = gpg.GPGStrategy(self._config_stack)
251
            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.
252
        self.store.add_object(c)
0.200.702 by Jelmer Vernooij
properly commit write group
253
        self.repository.commit_write_group()
0.200.1667 by Jelmer Vernooij
Set random_revid and _new_revision_id properties.
254
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
255
        return self._new_revision_id
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
256
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
257
    def abort(self):
0.334.1 by Jelmer Vernooij
Improve transaction and write group handling.
258
        if self.repository.is_in_write_group():
259
            self.repository.abort_write_group()
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
260
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
261
    def revision_tree(self):
262
        return self.repository.revision_tree(self._new_revision_id)
0.200.1678 by Jelmer Vernooij
Fix tests.
263
264
    def get_basis_delta(self):
0.396.1 by Jelmer Vernooij
Mark as not support per file revision recording.
265
        # TODO(jelmer): remove this logic when lp:~jelmer/brz/remaining lands
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
266
        for (oldpath, newpath, file_id, entry) in self._inv_delta:
267
            if entry is not None:
268
                entry.revision = self._new_revision_id
269
        return self._inv_delta
270
271
    def update_basis_by_delta(self, revid, delta):
272
        pass