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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-16 18:48:36 UTC
  • mfrom: (7343.1.1 fix-bot)
  • Revision ID: breezy.the.bot@gmail.com-20190616184836-ibpqmx4wgdb1vzy5
Fix corner case pushing to git.

Merged from https://code.launchpad.net/~jelmer/brz/fix-bot/+merge/368884

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/object_store.py
275
275
            if blob_id is None:
276
276
                new_blobs.append((change.path[1], change.file_id))
277
277
            else:
278
 
                shamap[path[1]] = blob_id
 
278
                # TODO(jelmer): This code path does not have any test coverage.
 
279
                shamap[change.path[1]] = blob_id
279
280
                if add_cache_entry is not None:
280
281
                    add_cache_entry(
281
282
                        ("blob", blob_id),
282
 
                        (file_id, tree.get_file_revision(change.path[1])), change.path[1])
 
283
                        (change.file_id, tree.get_file_revision(change.path[1])), change.path[1])
283
284
        elif change.kind[1] == "symlink":
284
285
            target = tree.get_symlink_target(change.path[1])
285
286
            blob = symlink_to_blob(target)