Rev 322: Simplify path_to_file_id function a bit. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

------------------------------------------------------------
revno: 322
revision-id: jelmer at samba.org-20061229005920-5fqkse7ru9l5we5l
parent: jelmer at samba.org-20061228183753-j6sxwwoaf81p6a50
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2006-12-29 01:59:20 +0100
message:
  Simplify path_to_file_id function a bit.
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'repository.py'
--- a/repository.py	2006-12-26 23:37:35 +0000
+++ b/repository.py	2006-12-29 00:59:20 +0000
@@ -261,26 +261,17 @@
     def path_to_file_id(self, revnum, path):
         """Generate a bzr file id from a Subversion file name. 
         
-        This implementation DOES NOT track renames.
-
         :param revnum: Revision number.
         :param path: Absolute path.
         :return: Tuple with file id and revision id.
         """
-        assert isinstance(revnum, int)
+        assert isinstance(revnum, int) and revnum >= 0
         assert isinstance(path, basestring)
-        assert revnum >= 0
-
-        path = path.strip("/")
 
         (bp, rp) = self.scheme.unprefix(path)
 
-        revid = self.generate_revision_id(revnum, bp)
-
-        map = self.get_fileid_map(revnum, bp)
-
         try:
-            return map[rp]
+            return self.get_fileid_map(revnum, bp)[rp]
         except KeyError:
             raise NoSuchFile(path=rp)