/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-06-18 03:08:00 UTC
  • mto: (7490.40.27 work)
  • mto: This revision was merged to the branch mainline in revision 7517.
  • Revision ID: jelmer@jelmer.uk-20200618030800-jsgupyes82s9s130
Add functions fo retrieving merge proposal source revision.

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