Merge lp:~spiv/bzr/faster-branch-open into lp:bzr

[Andrew Bennetts]

Make Branch.open more than 3x faster.

This patch serves two purposes:

 1) It makes Branch.open over 3x faster (it drops from ~6.5ms to 2ms in my testing of opening a local copy of lp's trunk)
 2) It will make Vincent pull a funny face.

[Jelmer Vernooij (jelmer)]

On 28/06/11 17:18, Andrew Bennetts wrote:
> For more details, see:
> https://code.launchpad.net/~spiv/bzr/faster-branch-open/+merge/66165
>
> This patch serves two purposes:
>
> 1) It makes Branch.open over 3x faster (it drops from ~6.5ms to 2ms in my testing of opening a local copy of lp's trunk)
> 2) It will make Vincent pull a funny face.
>
I'm not sure about 1), but 2) is definitely worthwhile.

Jelmer

[Andrew Bennetts (spiv)]

Vincent says this is okay, although he claims he didn't make any faces!

review: Approve

[Andrew Bennetts (spiv)]

sent to pqm by email

=== modified file 'bzrlib/branch.py'
--- bzrlib/branch.py	2011-06-20 11:04:42 +0000
+++ bzrlib/branch.py	2011-06-28 15:30:38 +0000
@@ -2942,7 +2942,11 @@
         # you can always ask for the URL; but you might not be able to use it
         # if the repo can't support stacking.
         ## self._check_stackable_repo()
-        stacked_url = self._get_config_location('stacked_on_location')
+        # stacked_on_location is only ever defined in branch.conf, so don't
+        # waste effort reading the whole stack of config files.
+        config = self.get_config()._get_branch_data_config()
+        stacked_url = self._get_config_location('stacked_on_location',
+            config=config)
         if stacked_url is None:
             raise errors.NotStacked(self)
         return stacked_url

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- doc/en/release-notes/bzr-2.4.txt	2011-06-28 13:55:39 +0000
+++ doc/en/release-notes/bzr-2.4.txt	2011-06-28 15:30:38 +0000
@@ -26,6 +26,9 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
+* ``Branch.open`` is now about 3x faster (about 2ms instead of 6.5ms).
+  (Andrew Bennetts).
+
 Bug Fixes
 *********