← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
67
67
            # or entirely uncompressed is tidy, but breaks upgrade from 
68
68
            # some existing branches where there's a mixture; we probably 
69
69
            # still want the option to look for both.
 
70
            name = unicode(name)
70
71
            relpath = self.control_files._rel_controlfilename(name)
71
72
            store = TextStore(self.control_files.make_transport(relpath),
72
73
                              prefixed=prefixed, compressed=compressed)
226
227
        file_id = tree.inventory.path2id(file)
227
228
        if not file_id:
228
229
            raise BzrError("%r is not present in revision %s" % (file, revno))
 
230
            try:
 
231
                revno = self.revision_id_to_revno(revision_id)
 
232
            except errors.NoSuchRevision:
 
233
                # TODO: This should not be BzrError,
 
234
                # but NoSuchFile doesn't fit either
 
235
                raise BzrError('%r is not present in revision %s' 
 
236
                                % (file, revision_id))
 
237
            else:
 
238
                raise BzrError('%r is not present in revision %s'
 
239
                                % (file, revno))
229
240
        tree.print_file(file_id)
230
241
 
231
242
    def get_transaction(self):