Rev 1419: Fix query, branch paths. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1419
revision-id: jelmer at samba.org-20080701211034-kldob0ont3ofzp1g
parent: jelmer at samba.org-20080701211009-0k0y2es919vf4v9w
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2008-07-01 23:10:34 +0200
message:
  Fix query, branch paths.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
=== modified file 'branch.py'
--- a/branch.py	2008-07-01 16:12:37 +0000
+++ b/branch.py	2008-07-01 21:10:34 +0000
@@ -66,17 +66,17 @@
         self.repository = repository
         assert isinstance(self.repository, SvnRepository)
         self.control_files = FakeControlFiles()
-        self.base = urlutils.join(self.repository.base, branch_path).rstrip("/")
         self._format = SvnBranchFormat()
         self._lock_mode = None
         self._lock_count = 0
         self.mapping = self.repository.get_mapping()
         self._branch_path = branch_path.strip("/")
+        self.base = urlutils.join(self.repository.base, self._branch_path).rstrip("/")
         self._revmeta_cache = None
         assert isinstance(self._branch_path, str)
         try:
             revnum = self.get_revnum()
-            if self.repository.transport.check_path(branch_path.strip("/"), 
+            if self.repository.transport.check_path(self._branch_path, 
                 revnum) != core.NODE_DIR:
                 raise NotBranchError(self.base)
         except SubversionException, (_, num):

=== modified file 'revids.py'
--- a/revids.py	2008-07-01 20:10:09 +0000
+++ b/revids.py	2008-07-01 21:10:34 +0000
@@ -233,7 +233,7 @@
         assert isinstance(revid, str)
         self.mutter("lookup revid %r", revid)
         ret = self.cachedb.execute(
-            "select path, min_revnum, max_revnum, scheme from revmap where revid=?" % (revid,)).fetchone()
+            "select path, min_revnum, max_revnum, scheme from revmap where revid=?", (revid,)).fetchone()
         if ret is None:
             raise NoSuchRevision(self, revid)
         return (ret[0].encode("utf-8"), int(ret[1]), int(ret[2]), ret[3].encode("utf-8"))