Rev 6264: (jelmer) Fix Branch.revision_id_to_revno in empty branches. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6264 [merge]
revision-id: pqm at pqm.ubuntu.com-20111116133830-ldl2m6p5cfkmlt6a
parent: pqm at pqm.ubuntu.com-20111116020425-w0dcxrz8os7akswd
parent: jelmer at samba.org-20111116122523-5na0mwaam2ejivj0
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-11-16 13:38:30 +0000
message:
  (jelmer) Fix Branch.revision_id_to_revno in empty branches. (Jelmer Vernooij)
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/tests/per_branch/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2011-10-14 13:56:45 +0000
+++ b/bzrlib/branch.py	2011-11-16 12:25:23 +0000
@@ -3030,6 +3030,8 @@
             except errors.RevisionNotPresent, e:
                 raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
             index = len(self._partial_revision_history_cache) - 1
+            if index < 0:
+                raise errors.NoSuchRevision(self, revision_id)
             if self._partial_revision_history_cache[index] != revision_id:
                 raise errors.NoSuchRevision(self, revision_id)
         return self.revno() - index

=== modified file 'bzrlib/tests/per_branch/test_revision_id_to_revno.py'
--- a/bzrlib/tests/per_branch/test_revision_id_to_revno.py	2011-09-24 13:00:12 +0000
+++ b/bzrlib/tests/per_branch/test_revision_id_to_revno.py	2011-11-16 12:25:23 +0000
@@ -56,3 +56,9 @@
             tree.branch.revision_id_to_revno, "unknown")
         self.assertEquals(1, tree.branch.revision_id_to_revno("rev1"))
         self.assertEquals(2, tree.branch.revision_id_to_revno("rev2"))
+
+    def test_empty(self):
+        branch = self.make_branch('.')
+        self.assertRaises(errors.NoSuchRevision,
+            branch.revision_id_to_revno, "unknown")
+        self.assertEquals(0, branch.revision_id_to_revno('null:'))

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-11-16 02:04:25 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-11-16 12:25:23 +0000
@@ -35,6 +35,9 @@
 * Support verifying signatures on remote repositories.
   (Jelmer Vernooij, #889694)
 
+* Support looking up revision numbers by revision id in empty branches.
+  (Jelmer Vernooij, #535031)
+
 Documentation
 *************