/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 commit.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-06 01:46:14 UTC
  • mfrom: (0.200.1819 work)
  • mto: (0.200.1820 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180306014614-w4yooagw6ufouzf4
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
173
173
            if fileid_map:
174
174
                fileid_blob = self._mapping.export_fileid_map(fileid_map)
175
175
                self.store.add_object(fileid_blob)
 
176
            else:
 
177
                fileid_blob = None
 
178
            if fileid_blob is not None:
176
179
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0644, fileid_blob.id)
177
180
            else:
178
181
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None