← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Robert Collins
  • Date: 2007-03-07 01:14:11 UTC
  • mfrom: (2321 +trunk)
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070307011411-0cmmc8atx67v3nv7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
171
171
        raise KeyError(revision_id)
172
172
 
173
173
    def revision_tree(self, repository, revision_id, base=None):
 
174
        revision_id = osutils.safe_revision_id(revision_id)
174
175
        revision = self.get_revision(revision_id)
175
176
        base = self.get_base(revision)
176
177
        assert base != revision_id
302
303
 
303
304
        def get_rev_id(last_changed, path, kind):
304
305
            if last_changed is not None:
305
 
                changed_revision_id = osutils.safe_revision_id(last_changed)
 
306
                # last_changed will be a Unicode string because of how it was
 
307
                # read. Convert it back to utf8.
 
308
                changed_revision_id = osutils.safe_revision_id(last_changed,
 
309
                                                               warn=False)
306
310
            else:
307
311
                changed_revision_id = revision_id
308
312
            bundle_tree.note_last_changed(path, changed_revision_id)
377
381
                        ': %r' % extra)
378
382
            # This will be Unicode because of how the stream is read. Turn it
379
383
            # back into a utf8 file_id
380
 
            file_id = osutils.safe_file_id(info[1][8:])
 
384
            file_id = osutils.safe_file_id(info[1][8:], warn=False)
381
385
 
382
386
            bundle_tree.note_id(file_id, path, kind)
383
387
            # this will be overridden in extra_info if executable is specified.