Rev 2781: Remove some spurious differences with bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2781
revision-id: robertc at robertcollins.net-20070925043415-zz6qfjgtsosnnf9y
parent: robertc at robertcollins.net-20070925023928-f0jo9l8veo6c4obc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2007-09-25 14:34:15 +1000
message:
  Remove some spurious differences with bzr.dev.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
=== modified file 'NEWS'
--- a/NEWS	2007-09-25 02:39:28 +0000
+++ b/NEWS	2007-09-25 04:34:15 +0000
@@ -430,10 +430,6 @@
      requested data to inserted return larger ranges and in forward read order
      to reduce the effect of network latency. (Robert Collins)
 
-   * New public method ``heads`` on the ``bzrlib.graph.Graph`` class. This is
-     a simple rename of a previously internal method which implements the same
-     semantics as heads(). (Robert Collins, John A Meinel)
-
    * Knits with no annotation cache still produce correct annotations.
      (Aaron Bentley)
 

=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2007-09-12 23:30:46 +0000
+++ b/bzrlib/branch.py	2007-09-25 04:34:15 +0000
@@ -2055,18 +2055,14 @@
             # we know the revno without needing to walk all of history
             revno = source_revno
         else:
-            # usually when revision_id is supplied it is the tip - try 
-            # for the fast_path
-            revno, tip_revision_id = self.last_revision_info()
-            if tip_revision_id != revision_id:
-                # To figure out the revno for a random revision, we need to
-                # build the revision history, and count its length.  We don't
-                # care about the order, just how long it is.  Alternatively, we
-                # could start at the current location, and count backwards. But
-                # there is no guarantee that we will find it since it may be a
-                # merged revision.
-                revno = len(list(self.repository.iter_reverse_revision_history(
-                                                                    revision_id)))
+            # To figure out the revno for a random revision, we need to build
+            # the revision history, and count its length.
+            # We don't care about the order, just how long it is.
+            # Alternatively, we could start at the current location, and count
+            # backwards. But there is no guarantee that we will find it since
+            # it may be a merged revision.
+            revno = len(list(self.repository.iter_reverse_revision_history(
+                                                                revision_id)))
         destination.set_last_revision_info(revno, revision_id)
 
     def _make_tags(self):

=== modified file 'bzrlib/repofmt/knitrepo.py'
--- a/bzrlib/repofmt/knitrepo.py	2007-09-20 22:58:47 +0000
+++ b/bzrlib/repofmt/knitrepo.py	2007-09-25 04:34:15 +0000
@@ -16,24 +16,11 @@
 
 from bzrlib.lazy_import import lazy_import
 lazy_import(globals(), """
-from itertools import izip
-import math
-import md5
-
 from bzrlib import (
     debug,
-    pack,
-    )
-from bzrlib.index import (
-    GraphIndex,
-    GraphIndexBuilder,
-    InMemoryGraphIndex,
-    CombinedGraphIndex,
-    GraphIndexPrefixAdapter,
-    )
-from bzrlib.knit import KnitGraphIndex, _PackAccess
-from bzrlib.pack import ContainerWriter
+    )
 from bzrlib.store import revision
+from bzrlib.store.revision.knit import KnitRevisionStore
 """)
 from bzrlib import (
     bzrdir,
@@ -56,10 +43,8 @@
     RootCommitBuilder,
     )
 import bzrlib.revision as _mod_revision
-from bzrlib.store.revision.knit import KnitRevisionStore
 from bzrlib.store.versioned import VersionedFileStore
-from bzrlib.trace import mutter, mutter_callsite, note, warning
-from bzrlib.trace import mutter, note, warning
+from bzrlib.trace import mutter, mutter_callsite
 from bzrlib.util import bencode