/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/plugins/git/fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-01 21:13:21 UTC
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180701211321-dazu15ry3tcvny2l
Fix some git tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/fetch.py
108
108
    if base_hexsha == hexsha and base_mode == mode:
109
109
        # If nothing has changed since the base revision, we're done
110
110
        return []
111
 
    file_id = lookup_file_id(path)
 
111
    file_id = lookup_file_id(osutils.safe_unicode(path))
112
112
    if stat.S_ISLNK(mode):
113
113
        cls = InventoryLink
114
114
    else:
264
264
        # If nothing has changed since the base revision, we're done
265
265
        return [], {}
266
266
    invdelta = []
267
 
    file_id = lookup_file_id(path)
 
267
    file_id = lookup_file_id(osutils.safe_unicode(path))
268
268
    # We just have to hope this is indeed utf-8:
269
269
    ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
270
270
    tree = lookup_object(hexsha)