/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/bundle/bundle_data.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-05-30 21:24:59 UTC
  • mfrom: (6630.1.4 deprecation)
  • Revision ID: breezy.the.bot@gmail.com-20170530212459-7n9a7isyb3nbim9y
Remove all deprecated arguments, functions and methods.

Merged from https://code.launchpad.net/~jelmer/brz/deprecation/+merge/324814

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/bundle_data.py
23
23
import pprint
24
24
 
25
25
from .. import (
 
26
    cache_utf8,
26
27
    osutils,
27
28
    timestamp,
28
29
    )
323
324
            if last_changed is not None:
324
325
                # last_changed will be a Unicode string because of how it was
325
326
                # read. Convert it back to utf8.
326
 
                changed_revision_id = osutils.safe_revision_id(last_changed,
327
 
                                                               warn=False)
 
327
                changed_revision_id = cache_utf8.encode(last_changed)
328
328
            else:
329
329
                changed_revision_id = revision_id
330
330
            bundle_tree.note_last_changed(path, changed_revision_id)
399
399
                        ': %r' % extra)
400
400
            # This will be Unicode because of how the stream is read. Turn it
401
401
            # back into a utf8 file_id
402
 
            file_id = osutils.safe_file_id(info[1][8:], warn=False)
 
402
            file_id = cache_utf8.encode(info[1][8:])
403
403
 
404
404
            bundle_tree.note_id(file_id, path, kind)
405
405
            # this will be overridden in extra_info if executable is specified.