/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: 2020-07-20 02:17:05 UTC
  • mfrom: (7518.1.2 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200720021705-5f11tmo1hdqjxm6x
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/387628

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/object_store.py
54
54
    )
55
55
from .mapping import (
56
56
    default_mapping,
 
57
    encode_git_path,
57
58
    entry_mode,
58
59
    extract_unusual_modes,
59
60
    mapping_registry,
199
200
            mode = entry_mode(value)
200
201
        hexsha = lookup_ie_sha1(child_path, value)
201
202
        if hexsha is not None:
202
 
            tree.add(value.name.encode("utf-8"), mode, hexsha)
 
203
            tree.add(encode_git_path(value.name), mode, hexsha)
203
204
    if not allow_empty and len(tree) == 0:
204
205
        # Only the root can be an empty tree
205
206
        if empty_file_name is not None: