/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2020-09-02 15:11:17 UTC
  • mto: (7490.40.109 work)
  • mto: This revision was merged to the branch mainline in revision 7526.
  • Revision ID: jelmer@jelmer.uk-20200902151117-jeu7tarbz3dkuju0
Move more transform code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
 
1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
 
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
"""Support for committing in native Git working trees."""
 
19
 
 
20
from __future__ import absolute_import
 
21
 
 
22
from dulwich.index import (
 
23
    commit_tree,
 
24
    read_submodule_head,
 
25
    )
 
26
import stat
 
27
 
 
28
from .. import (
 
29
    bugtracker,
 
30
    config as _mod_config,
 
31
    gpg,
 
32
    osutils,
 
33
    revision as _mod_revision,
 
34
    )
 
35
from ..errors import (
 
36
    BzrError,
 
37
    RootMissing,
 
38
    UnsupportedOperation,
 
39
    )
 
40
from ..repository import (
 
41
    CommitBuilder,
 
42
    )
 
43
from ..sixish import (
 
44
    viewitems,
 
45
    )
 
46
 
 
47
from dulwich.objects import (
 
48
    Blob,
 
49
    Commit,
 
50
    )
 
51
 
 
52
 
 
53
from .mapping import (
 
54
    encode_git_path,
 
55
    object_mode,
 
56
    fix_person_identifier,
 
57
    )
 
58
from .tree import entry_factory
 
59
 
 
60
 
 
61
class GitCommitBuilder(CommitBuilder):
 
62
    """Commit builder for Git repositories."""
 
63
 
 
64
    supports_record_entry_contents = False
 
65
 
 
66
    def __init__(self, *args, **kwargs):
 
67
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
 
68
        self.random_revid = True
 
69
        self._validate_revprops(self._revprops)
 
70
        self.store = self.repository._git.object_store
 
71
        self._blobs = {}
 
72
        self._inv_delta = []
 
73
        self._deleted_paths = set()
 
74
        self._any_changes = False
 
75
        self._mapping = self.repository.get_mapping()
 
76
 
 
77
    def any_changes(self):
 
78
        return self._any_changes
 
79
 
 
80
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
 
81
        seen_root = False
 
82
        for change in iter_changes:
 
83
            if change.kind == (None, None):
 
84
                # Ephemeral
 
85
                continue
 
86
            if change.versioned[0] and not change.copied:
 
87
                file_id = self._mapping.generate_file_id(change.path[0])
 
88
            elif change.versioned[1]:
 
89
                file_id = self._mapping.generate_file_id(change.path[1])
 
90
            else:
 
91
                file_id = None
 
92
            if change.path[1]:
 
93
                parent_id_new = self._mapping.generate_file_id(osutils.dirname(change.path[1]))
 
94
            else:
 
95
                parent_id_new = None
 
96
            if change.kind[1] in ("directory",):
 
97
                self._inv_delta.append(
 
98
                    (change.path[0], change.path[1], file_id,
 
99
                     entry_factory[change.kind[1]](
 
100
                         file_id, change.name[1], parent_id_new)))
 
101
                if change.kind[0] in ("file", "symlink"):
 
102
                    self._blobs[encode_git_path(change.path[0])] = None
 
103
                    self._any_changes = True
 
104
                if change.path[1] == "":
 
105
                    seen_root = True
 
106
                continue
 
107
            self._any_changes = True
 
108
            if change.path[1] is None:
 
109
                self._inv_delta.append((change.path[0], change.path[1], file_id, None))
 
110
                self._deleted_paths.add(encode_git_path(change.path[0]))
 
111
                continue
 
112
            try:
 
113
                entry_kls = entry_factory[change.kind[1]]
 
114
            except KeyError:
 
115
                raise KeyError("unknown kind %s" % change.kind[1])
 
116
            entry = entry_kls(file_id, change.name[1], parent_id_new)
 
117
            if change.kind[1] == "file":
 
118
                entry.executable = change.executable[1]
 
119
                blob = Blob()
 
120
                f, st = workingtree.get_file_with_stat(change.path[1])
 
121
                try:
 
122
                    blob.data = f.read()
 
123
                finally:
 
124
                    f.close()
 
125
                sha = blob.id
 
126
                if st is not None:
 
127
                    entry.text_size = st.st_size
 
128
                else:
 
129
                    entry.text_size = len(blob.data)
 
130
                entry.git_sha1 = sha
 
131
                self.store.add_object(blob)
 
132
            elif change.kind[1] == "symlink":
 
133
                symlink_target = workingtree.get_symlink_target(change.path[1])
 
134
                blob = Blob()
 
135
                blob.data = encode_git_path(symlink_target)
 
136
                self.store.add_object(blob)
 
137
                sha = blob.id
 
138
                entry.symlink_target = symlink_target
 
139
                st = None
 
140
            elif change.kind[1] == "tree-reference":
 
141
                sha = read_submodule_head(workingtree.abspath(change.path[1]))
 
142
                reference_revision = workingtree.get_reference_revision(change.path[1])
 
143
                entry.reference_revision = reference_revision
 
144
                st = None
 
145
            else:
 
146
                raise AssertionError("Unknown kind %r" % change.kind[1])
 
147
            mode = object_mode(change.kind[1], change.executable[1])
 
148
            self._inv_delta.append((change.path[0], change.path[1], file_id, entry))
 
149
            if change.path[0] is not None:
 
150
                self._deleted_paths.add(encode_git_path(change.path[0]))
 
151
            self._blobs[encode_git_path(change.path[1])] = (mode, sha)
 
152
            if st is not None:
 
153
                yield change.path[1], (entry.git_sha1, st)
 
154
        if not seen_root and len(self.parents) == 0:
 
155
            raise RootMissing()
 
156
        if getattr(workingtree, "basis_tree", False):
 
157
            basis_tree = workingtree.basis_tree()
 
158
        else:
 
159
            if len(self.parents) == 0:
 
160
                basis_revid = _mod_revision.NULL_REVISION
 
161
            else:
 
162
                basis_revid = self.parents[0]
 
163
            basis_tree = self.repository.revision_tree(basis_revid)
 
164
        # Fill in entries that were not changed
 
165
        for entry in basis_tree._iter_tree_contents(include_trees=False):
 
166
            if entry.path in self._blobs:
 
167
                continue
 
168
            if entry.path in self._deleted_paths:
 
169
                continue
 
170
            self._blobs[entry.path] = (entry.mode, entry.sha)
 
171
        self.new_inventory = None
 
172
 
 
173
    def update_basis(self, tree):
 
174
        # Nothing to do here
 
175
        pass
 
176
 
 
177
    def finish_inventory(self):
 
178
        # eliminate blobs that were removed
 
179
        self._blobs = {k: v for (k, v) in viewitems(self._blobs)}
 
180
 
 
181
    def _iterblobs(self):
 
182
        return ((path, sha, mode) for (path, (mode, sha))
 
183
                in viewitems(self._blobs))
 
184
 
 
185
    def commit(self, message):
 
186
        self._validate_unicode_text(message, 'commit message')
 
187
        c = Commit()
 
188
        c.parents = [self.repository.lookup_bzr_revision_id(
 
189
            revid)[0] for revid in self.parents]
 
190
        c.tree = commit_tree(self.store, self._iterblobs())
 
191
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
 
192
        c.encoding = encoding.encode('ascii')
 
193
        c.committer = fix_person_identifier(self._committer.encode(encoding))
 
194
        try:
 
195
            author = self._revprops.pop('author')
 
196
        except KeyError:
 
197
            try:
 
198
                authors = self._revprops.pop('authors').splitlines()
 
199
            except KeyError:
 
200
                author = self._committer
 
201
            else:
 
202
                if len(authors) > 1:
 
203
                    raise Exception("Unable to convert multiple authors")
 
204
                elif len(authors) == 0:
 
205
                    author = self._committer
 
206
                else:
 
207
                    author = authors[0]
 
208
        c.author = fix_person_identifier(author.encode(encoding))
 
209
        bugstext = self._revprops.pop('bugs', None)
 
210
        if bugstext is not None:
 
211
            message += "\n"
 
212
            for url, status in bugtracker.decode_bug_urls(bugstext):
 
213
                if status == bugtracker.FIXED:
 
214
                    message += "Fixes: %s\n" % url
 
215
                elif status == bugtracker.RELATED:
 
216
                    message += "Bug: %s\n" % url
 
217
                else:
 
218
                    raise bugtracker.InvalidBugStatus(status)
 
219
        if self._revprops:
 
220
            raise NotImplementedError(self._revprops)
 
221
        c.commit_time = int(self._timestamp)
 
222
        c.author_time = int(self._timestamp)
 
223
        c.commit_timezone = self._timezone
 
224
        c.author_timezone = self._timezone
 
225
        c.message = message.encode(encoding)
 
226
        if (self._config_stack.get('create_signatures') ==
 
227
                _mod_config.SIGN_ALWAYS):
 
228
            strategy = gpg.GPGStrategy(self._config_stack)
 
229
            c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
 
230
        self.store.add_object(c)
 
231
        self.repository.commit_write_group()
 
232
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
 
233
        return self._new_revision_id
 
234
 
 
235
    def abort(self):
 
236
        if self.repository.is_in_write_group():
 
237
            self.repository.abort_write_group()
 
238
 
 
239
    def revision_tree(self):
 
240
        return self.repository.revision_tree(self._new_revision_id)
 
241
 
 
242
    def get_basis_delta(self):
 
243
        return self._inv_delta
 
244
 
 
245
    def update_basis_by_delta(self, revid, delta):
 
246
        pass