/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-11 04:08:32 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181111040832-nsljjynzzwmznf3h
Run autopep8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
89
89
        for (file_id, path, changed_content, versioned, parent, name, kind,
90
90
             executable) in iter_changes:
91
91
            if kind[1] in ("directory",):
92
 
                self._inv_delta.append((path[0], path[1], file_id, entry_factory[kind[1]](file_id, name[1], parent[1])))
 
92
                self._inv_delta.append(
 
93
                    (path[0], path[1], file_id, entry_factory[kind[1]](file_id, name[1], parent[1])))
93
94
                if kind[0] in ("file", "symlink"):
94
95
                    self._blobs[path[0].encode("utf-8")] = None
95
96
                    self._any_changes = True
119
120
                self.store.add_object(blob)
120
121
                sha = blob.id
121
122
            elif kind[1] == "symlink":
122
 
                symlink_target = workingtree.get_symlink_target(path[1], file_id)
 
123
                symlink_target = workingtree.get_symlink_target(
 
124
                    path[1], file_id)
123
125
                blob = Blob()
124
126
                blob.data = symlink_target.encode("utf-8")
125
127
                self.store.add_object(blob)
128
130
                st = None
129
131
            elif kind[1] == "tree-reference":
130
132
                sha = read_submodule_head(workingtree.abspath(path[1]))
131
 
                reference_revision = workingtree.get_reference_revision(path[1], file_id)
 
133
                reference_revision = workingtree.get_reference_revision(
 
134
                    path[1], file_id)
132
135
                entry.reference_revision = reference_revision
133
136
                st = None
134
137
            else:
181
184
                if self._mapping.BZR_FILE_IDS_FILE is None:
182
185
                    raise SettingCustomFileIdsUnsupported(fileid_map)
183
186
                self.store.add_object(fileid_blob)
184
 
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0o644, fileid_blob.id)
 
187
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (
 
188
                    stat.S_IFREG | 0o644, fileid_blob.id)
185
189
            else:
186
190
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
187
191
        self.new_inventory = None
192
196
 
193
197
    def finish_inventory(self):
194
198
        # eliminate blobs that were removed
195
 
        self._blobs = {k: v for (k, v) in viewitems(self._blobs) if v is not None}
 
199
        self._blobs = {k: v for (k, v) in viewitems(
 
200
            self._blobs) if v is not None}
196
201
 
197
202
    def _iterblobs(self):
198
203
        return ((path, sha, mode) for (path, (mode, sha)) in viewitems(self._blobs))
200
205
    def commit(self, message):
201
206
        self._validate_unicode_text(message, 'commit message')
202
207
        c = Commit()
203
 
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
 
208
        c.parents = [self.repository.lookup_bzr_revision_id(
 
209
            revid)[0] for revid in self.parents]
204
210
        c.tree = commit_tree(self.store, self._iterblobs())
205
211
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
206
212
        c.encoding = encoding.encode('ascii')
207
213
        c.committer = fix_person_identifier(self._committer.encode(encoding))
208
 
        c.author = fix_person_identifier(self._revprops.pop('author', self._committer).encode(encoding))
 
214
        c.author = fix_person_identifier(self._revprops.pop(
 
215
            'author', self._committer).encode(encoding))
209
216
        if self._revprops:
210
217
            raise NotImplementedError(self._revprops)
211
218
        c.commit_time = int(self._timestamp)