/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: 2018-11-10 17:18:27 UTC
  • mto: (7143.11.2 unused-imports)
  • mto: This revision was merged to the branch mainline in revision 7144.
  • Revision ID: jelmer@jelmer.uk-20181110171827-46xer5sa9fzgab1q
Add flake8 configuration to monkey patch for lazy imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
17
17
 
18
18
"""Support for committing in native Git working trees."""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
20
22
from dulwich.index import (
21
23
    commit_tree,
22
24
    )
 
25
import os
23
26
import stat
24
27
 
25
28
from .. import (
26
 
    bugtracker,
27
29
    config as _mod_config,
28
30
    gpg,
29
31
    osutils,
37
39
from ..repository import (
38
40
    CommitBuilder,
39
41
    )
 
42
from ..sixish import (
 
43
    viewitems,
 
44
    )
40
45
 
41
46
from dulwich.objects import (
 
47
    S_IFGITLINK,
42
48
    Blob,
43
49
    Commit,
44
50
    )
45
51
from dulwich.index import read_submodule_head
 
52
from dulwich.repo import Repo
46
53
 
47
54
 
48
55
from .mapping import (
49
 
    encode_git_path,
 
56
    entry_mode,
50
57
    object_mode,
51
58
    fix_person_identifier,
52
59
    )
53
60
from .tree import entry_factory
54
61
 
55
62
 
 
63
class SettingCustomFileIdsUnsupported(UnsupportedOperation):
 
64
 
 
65
    _fmt = "Unable to store addition of file with custom file ids: %(file_ids)r"
 
66
 
 
67
    def __init__(self, file_ids):
 
68
        BzrError.__init__(self)
 
69
        self.file_ids = file_ids
 
70
 
 
71
 
56
72
class GitCommitBuilder(CommitBuilder):
57
73
    """Commit builder for Git repositories."""
58
74
 
65
81
        self.store = self.repository._git.object_store
66
82
        self._blobs = {}
67
83
        self._inv_delta = []
68
 
        self._deleted_paths = set()
69
84
        self._any_changes = False
 
85
        self._override_fileids = {}
70
86
        self._mapping = self.repository.get_mapping()
71
87
 
72
88
    def any_changes(self):
74
90
 
75
91
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
76
92
        seen_root = False
77
 
        for change in iter_changes:
78
 
            if change.kind[1] in ("directory",):
79
 
                self._inv_delta.append(
80
 
                    (change.path[0], change.path[1], change.file_id,
81
 
                     entry_factory[change.kind[1]](
82
 
                         change.file_id, change.name[1], change.parent_id[1])))
83
 
                if change.kind[0] in ("file", "symlink"):
84
 
                    self._blobs[encode_git_path(change.path[0])] = None
 
93
        for (file_id, path, changed_content, versioned, parent, name, kind,
 
94
             executable) in iter_changes:
 
95
            if kind[1] in ("directory",):
 
96
                self._inv_delta.append((path[0], path[1], file_id, entry_factory[kind[1]](file_id, name[1], parent[1])))
 
97
                if kind[0] in ("file", "symlink"):
 
98
                    self._blobs[path[0].encode("utf-8")] = None
85
99
                    self._any_changes = True
86
 
                if change.path[1] == "":
 
100
                if path[1] == "":
87
101
                    seen_root = True
88
102
                continue
89
103
            self._any_changes = True
90
 
            if change.path[1] is None:
91
 
                self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
92
 
                self._deleted_paths.add(encode_git_path(change.path[0]))
 
104
            if path[1] is None:
 
105
                self._inv_delta.append((path[0], path[1], file_id, None))
 
106
                self._blobs[path[0].encode("utf-8")] = None
93
107
                continue
94
108
            try:
95
 
                entry_kls = entry_factory[change.kind[1]]
 
109
                entry_kls = entry_factory[kind[1]]
96
110
            except KeyError:
97
 
                raise KeyError("unknown kind %s" % change.kind[1])
98
 
            entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
99
 
            if change.kind[1] == "file":
100
 
                entry.executable = change.executable[1]
 
111
                raise KeyError("unknown kind %s" % kind[1])
 
112
            entry = entry_kls(file_id, name[1], parent[1])
 
113
            if kind[1] == "file":
 
114
                entry.executable = executable[1]
101
115
                blob = Blob()
102
 
                f, st = workingtree.get_file_with_stat(change.path[1])
 
116
                f, st = workingtree.get_file_with_stat(path[1], file_id)
103
117
                try:
104
118
                    blob.data = f.read()
105
119
                finally:
108
122
                entry.text_sha1 = osutils.sha_string(blob.data)
109
123
                self.store.add_object(blob)
110
124
                sha = blob.id
111
 
            elif change.kind[1] == "symlink":
112
 
                symlink_target = workingtree.get_symlink_target(change.path[1])
 
125
            elif kind[1] == "symlink":
 
126
                symlink_target = workingtree.get_symlink_target(path[1], file_id)
113
127
                blob = Blob()
114
 
                blob.data = encode_git_path(symlink_target)
 
128
                blob.data = symlink_target.encode("utf-8")
115
129
                self.store.add_object(blob)
116
130
                sha = blob.id
117
131
                entry.symlink_target = symlink_target
118
132
                st = None
119
 
            elif change.kind[1] == "tree-reference":
120
 
                sha = read_submodule_head(workingtree.abspath(change.path[1]))
121
 
                reference_revision = workingtree.get_reference_revision(change.path[1])
 
133
            elif kind[1] == "tree-reference":
 
134
                sha = read_submodule_head(workingtree.abspath(path[1]))
 
135
                reference_revision = workingtree.get_reference_revision(path[1], file_id)
122
136
                entry.reference_revision = reference_revision
123
137
                st = None
124
138
            else:
125
 
                raise AssertionError("Unknown kind %r" % change.kind[1])
126
 
            mode = object_mode(change.kind[1], change.executable[1])
127
 
            self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
128
 
            if change.path[0] is not None:
129
 
                self._deleted_paths.add(encode_git_path(change.path[0]))
130
 
            self._blobs[encode_git_path(change.path[1])] = (mode, sha)
 
139
                raise AssertionError("Unknown kind %r" % kind[1])
 
140
            mode = object_mode(kind[1], executable[1])
 
141
            self._inv_delta.append((path[0], path[1], file_id, entry))
 
142
            encoded_new_path = path[1].encode("utf-8")
 
143
            self._blobs[encoded_new_path] = (mode, sha)
131
144
            if st is not None:
132
 
                yield change.path[1], (entry.text_sha1, st)
 
145
                yield file_id, path[1], (entry.text_sha1, st)
 
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
133
150
        if not seen_root and len(self.parents) == 0:
134
151
            raise RootMissing()
135
152
        if getattr(workingtree, "basis_tree", False):
144
161
        for entry in basis_tree._iter_tree_contents(include_trees=False):
145
162
            if entry.path in self._blobs:
146
163
                continue
147
 
            if entry.path in self._deleted_paths:
148
 
                continue
149
164
            self._blobs[entry.path] = (entry.mode, entry.sha)
 
165
        if not self._lossy:
 
166
            try:
 
167
                fileid_map = dict(basis_tree._fileid_map.file_ids)
 
168
            except AttributeError:
 
169
                fileid_map = {}
 
170
            for path, file_id in viewitems(self._override_fileids):
 
171
                if not isinstance(path, bytes):
 
172
                    raise TypeError(path)
 
173
                if file_id is None:
 
174
                    if path in fileid_map:
 
175
                        del fileid_map[path]
 
176
                else:
 
177
                    if not isinstance(file_id, bytes):
 
178
                        raise TypeError(file_id)
 
179
                    fileid_map[path] = file_id
 
180
            if fileid_map:
 
181
                fileid_blob = self._mapping.export_fileid_map(fileid_map)
 
182
            else:
 
183
                fileid_blob = None
 
184
            if fileid_blob is not None:
 
185
                if self._mapping.BZR_FILE_IDS_FILE is None:
 
186
                    raise SettingCustomFileIdsUnsupported(fileid_map)
 
187
                self.store.add_object(fileid_blob)
 
188
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0o644, fileid_blob.id)
 
189
            else:
 
190
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
150
191
        self.new_inventory = None
151
192
 
152
193
    def update_basis(self, tree):
155
196
 
156
197
    def finish_inventory(self):
157
198
        # eliminate blobs that were removed
158
 
        self._blobs = {k: v for (k, v) in self._blobs.items()}
 
199
        self._blobs = {k: v for (k, v) in viewitems(self._blobs) if v is not None}
159
200
 
160
201
    def _iterblobs(self):
161
 
        return ((path, sha, mode) for (path, (mode, sha))
162
 
                in self._blobs.items())
 
202
        return ((path, sha, mode) for (path, (mode, sha)) in viewitems(self._blobs))
163
203
 
164
204
    def commit(self, message):
165
205
        self._validate_unicode_text(message, 'commit message')
166
206
        c = Commit()
167
 
        c.parents = [self.repository.lookup_bzr_revision_id(
168
 
            revid)[0] for revid in self.parents]
 
207
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
169
208
        c.tree = commit_tree(self.store, self._iterblobs())
170
209
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
171
210
        c.encoding = encoding.encode('ascii')
172
211
        c.committer = fix_person_identifier(self._committer.encode(encoding))
173
 
        try:
174
 
            author = self._revprops.pop('author')
175
 
        except KeyError:
176
 
            try:
177
 
                authors = self._revprops.pop('authors').splitlines()
178
 
            except KeyError:
179
 
                author = self._committer
180
 
            else:
181
 
                if len(authors) > 1:
182
 
                    raise Exception("Unable to convert multiple authors")
183
 
                elif len(authors) == 0:
184
 
                    author = self._committer
185
 
                else:
186
 
                    author = authors[0]
187
 
        c.author = fix_person_identifier(author.encode(encoding))
188
 
        bugstext = self._revprops.pop('bugs', None)
189
 
        if bugstext is not None:
190
 
            message += "\n"
191
 
            for url, status in bugtracker.decode_bug_urls(bugstext):
192
 
                if status == bugtracker.FIXED:
193
 
                    message += "Fixes: %s\n" % url
194
 
                elif status == bugtracker.RELATED:
195
 
                    message += "Bug: %s\n" % url
196
 
                else:
197
 
                    raise bugtracker.InvalidBugStatus(status)
 
212
        c.author = fix_person_identifier(self._revprops.pop('author', self._committer).encode(encoding))
198
213
        if self._revprops:
199
214
            raise NotImplementedError(self._revprops)
200
215
        c.commit_time = int(self._timestamp)
202
217
        c.commit_timezone = self._timezone
203
218
        c.author_timezone = self._timezone
204
219
        c.message = message.encode(encoding)
205
 
        if (self._config_stack.get('create_signatures') ==
206
 
                _mod_config.SIGN_ALWAYS):
 
220
        if self._config_stack.get('create_signatures') == _mod_config.SIGN_ALWAYS:
207
221
            strategy = gpg.GPGStrategy(self._config_stack)
208
222
            c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
209
223
        self.store.add_object(c)
219
233
        return self.repository.revision_tree(self._new_revision_id)
220
234
 
221
235
    def get_basis_delta(self):
 
236
        # TODO(jelmer): remove this logic when lp:~jelmer/brz/remaining lands
 
237
        for (oldpath, newpath, file_id, entry) in self._inv_delta:
 
238
            if entry is not None:
 
239
                entry.revision = self._new_revision_id
222
240
        return self._inv_delta
223
241
 
224
242
    def update_basis_by_delta(self, revid, delta):