Rev 2158: Merge tidy-up to BzrDir.cloning_metadir. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

[Andrew Bennetts]

At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

------------------------------------------------------------
revno: 2158
revision-id: andrew.bennetts at canonical.com-20070306071340-1nsftdleyx0ye73k
parent: andrew.bennetts at canonical.com-20070306053139-9rntcbp5gi9008o9
parent: andrew.bennetts at canonical.com-20070306071137-7aoryabu1ychy6ge
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-06 18:13:40 +1100
message:
  Merge tidy-up to BzrDir.cloning_metadir.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.1.1
    merged: andrew.bennetts at canonical.com-20070306071137-7aoryabu1ychy6ge
    parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: trivial
    timestamp: Tue 2007-03-06 18:11:37 +1100
    message:
      Tidy up BzrDir.cloning_metadir: bogus try/except, and basis argument isn't actually used.
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2007-03-01 05:08:32 +0000
+++ b/bzrlib/bzrdir.py	2007-03-06 07:13:40 +0000
@@ -639,7 +639,7 @@
         except errors.NoWorkingTree:
             return False
 
-    def cloning_metadir(self, basis=None):
+    def cloning_metadir(self):
         """Produce a metadir suitable for cloning with"""
         def related_repository(bzrdir):
             try:
@@ -650,15 +650,11 @@
                 return bzrdir.open_repository()
         result_format = self._format.__class__()
         try:
-            try:
-                source_repository = related_repository(self)
-            except errors.NoRepositoryPresent:
-                if basis is None:
-                    raise
-                source_repository = related_repository(self)
+            source_repository = related_repository(self)
+        except errors.NoRepositoryPresent:
+            pass
+        else:
             result_format.repository_format = source_repository._format
-        except errors.NoRepositoryPresent:
-            pass
         return result_format
 
     def sprout(self, url, revision_id=None, basis=None, force_new_repo=False):
@@ -676,7 +672,7 @@
             itself to download less data.
         """
         self._make_tail(url)
-        cloning_format = self.cloning_metadir(basis)
+        cloning_format = self.cloning_metadir()
         result = cloning_format.initialize(url)
         basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
         try: