[MERGE] Remove most calls to safe_file_id and safe_revision_id.

Alexander Belchenko bialix at ukr.net
Tue Sep 25 21:27:00 BST 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool пишет:
> As previously suggested by John, this removes the compatibility
> interface that accepted unicode objects for revision_id parameters.

bb:comment

I'm not very familiar with this functionality, so I'm not sure
I can vote on this patch. Though patch seems quite mechanical:
many many similar lines deleted.

Just few comments:

=== modified file 'bzrlib/repository.py'
- --- bzrlib/repository.py	2007-09-25 03:36:29 +0000
+++ bzrlib/repository.py	2007-09-25 08:14:12 +0000
@@ -1070,7 +1059,6 @@
         """Get Inventory object by hash."""
         # TODO: jam 20070210 Technically we don't need to sanitize, since all
         #       called functions must sanitize.
- -        revision_id = osutils.safe_revision_id(revision_id)

^-- Is not TODO in comments should be also removed?

         return self.deserialise_inventory(
             revision_id, self.get_inventory_xml(revision_id))

@@ -1110,7 +1096,6 @@
         """Return the sha1 hash of the inventory entry
         """
         # TODO: jam 20070210 Shouldn't this be deprecated / removed?
- -        revision_id = osutils.safe_revision_id(revision_id)
         return self.get_revision(revision_id).inventory_sha1

^-- and here too?

     @needs_read_lock

@@ -1851,7 +1827,6 @@
         if revision_id is not None:
             # TODO: jam 20070210 InterRepository is internal enough that it
             #       should assume revision_ids are already utf-8
- -            revision_id = osutils.safe_revision_id(revision_id)


^-- and here too?

             source_ids = self.source.get_ancestry(revision_id)
             assert source_ids[0] is None
             source_ids.pop(0)


Otherwise looks OK for me.

- --
[µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFG+W8UzYr338mxwCURAiRXAJ9iY/XRpPIK74+R+DMWfdLrjw9KAQCePt8z
TyOvqBm5AwP2aUtjWuVEHjk=
=vsuv
-----END PGP SIGNATURE-----



More information about the bazaar mailing list