/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: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
57
57
from .tree import entry_factory
58
58
 
59
59
 
 
60
class SettingCustomFileIdsUnsupported(UnsupportedOperation):
 
61
 
 
62
    _fmt = ("Unable to store addition of file with custom file ids: "
 
63
            "%(file_ids)r")
 
64
 
 
65
    def __init__(self, file_ids):
 
66
        BzrError.__init__(self)
 
67
        self.file_ids = file_ids
 
68
 
 
69
 
60
70
class GitCommitBuilder(CommitBuilder):
61
71
    """Commit builder for Git repositories."""
62
72
 
70
80
        self._blobs = {}
71
81
        self._inv_delta = []
72
82
        self._any_changes = False
 
83
        self._override_fileids = {}
73
84
        self._mapping = self.repository.get_mapping()
74
85
 
75
86
    def any_changes(self):
77
88
 
78
89
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
79
90
        seen_root = False
80
 
        for change in iter_changes:
81
 
            if change.kind[1] in ("directory",):
 
91
        for (file_id, path, changed_content, versioned, parent, name, kind,
 
92
             executable) in iter_changes:
 
93
            if kind[1] in ("directory",):
82
94
                self._inv_delta.append(
83
 
                    (change.path[0], change.path[1], change.file_id,
84
 
                     entry_factory[change.kind[1]](
85
 
                         change.file_id, change.name[1], change.parent_id[1])))
86
 
                if change.kind[0] in ("file", "symlink"):
87
 
                    self._blobs[change.path[0].encode("utf-8")] = None
 
95
                    (path[0], path[1], file_id, entry_factory[kind[1]](
 
96
                        file_id, name[1], parent[1])))
 
97
                if kind[0] in ("file", "symlink"):
 
98
                    self._blobs[path[0].encode("utf-8")] = None
88
99
                    self._any_changes = True
89
 
                if change.path[1] == "":
 
100
                if path[1] == "":
90
101
                    seen_root = True
91
102
                continue
92
103
            self._any_changes = True
93
 
            if change.path[1] is None:
94
 
                self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
95
 
                self._blobs[change.path[0].encode("utf-8")] = None
 
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
96
107
                continue
97
108
            try:
98
 
                entry_kls = entry_factory[change.kind[1]]
 
109
                entry_kls = entry_factory[kind[1]]
99
110
            except KeyError:
100
 
                raise KeyError("unknown kind %s" % change.kind[1])
101
 
            entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
102
 
            if change.kind[1] == "file":
103
 
                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]
104
115
                blob = Blob()
105
 
                f, st = workingtree.get_file_with_stat(change.path[1])
 
116
                f, st = workingtree.get_file_with_stat(path[1])
106
117
                try:
107
118
                    blob.data = f.read()
108
119
                finally:
111
122
                entry.text_sha1 = osutils.sha_string(blob.data)
112
123
                self.store.add_object(blob)
113
124
                sha = blob.id
114
 
            elif change.kind[1] == "symlink":
115
 
                symlink_target = workingtree.get_symlink_target(change.path[1])
 
125
            elif kind[1] == "symlink":
 
126
                symlink_target = workingtree.get_symlink_target(path[1])
116
127
                blob = Blob()
117
128
                blob.data = symlink_target.encode("utf-8")
118
129
                self.store.add_object(blob)
119
130
                sha = blob.id
120
131
                entry.symlink_target = symlink_target
121
132
                st = None
122
 
            elif change.kind[1] == "tree-reference":
123
 
                sha = read_submodule_head(workingtree.abspath(change.path[1]))
124
 
                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])
125
136
                entry.reference_revision = reference_revision
126
137
                st = None
127
138
            else:
128
 
                raise AssertionError("Unknown kind %r" % change.kind[1])
129
 
            mode = object_mode(change.kind[1], change.executable[1])
130
 
            self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
131
 
            encoded_new_path = change.path[1].encode("utf-8")
 
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")
132
143
            self._blobs[encoded_new_path] = (mode, sha)
133
144
            if st is not None:
134
 
                yield change.path[1], (entry.text_sha1, st)
 
145
                yield 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
135
150
        if not seen_root and len(self.parents) == 0:
136
151
            raise RootMissing()
137
152
        if getattr(workingtree, "basis_tree", False):
147
162
            if entry.path in self._blobs:
148
163
                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] = (
 
189
                    stat.S_IFREG | 0o644, fileid_blob.id)
 
190
            else:
 
191
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
150
192
        self.new_inventory = None
151
193
 
152
194
    def update_basis(self, tree):
220
262
        return self.repository.revision_tree(self._new_revision_id)
221
263
 
222
264
    def get_basis_delta(self):
 
265
        # TODO(jelmer): remove this logic when lp:~jelmer/brz/remaining lands
 
266
        for (oldpath, newpath, file_id, entry) in self._inv_delta:
 
267
            if entry is not None:
 
268
                entry.revision = self._new_revision_id
223
269
        return self._inv_delta
224
270
 
225
271
    def update_basis_by_delta(self, revid, delta):