Rev 109: Cope with new argument to cloning_metadir. in http://people.samba.org/bzr/jelmer/bzr-git/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-git/trunk

------------------------------------------------------------
revno: 109
revision-id: jelmer at samba.org-20080906134222-77jwhfa9dizn3r6b
parent: jelmer at samba.org-20080901154259-clh6u0nr5ubr3d2m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2008-09-06 15:42:22 +0200
message:
  Cope with new argument to cloning_metadir.
modified:
  dir.py                         git_dir.py-20071108234408-ygidvy5hviixghsd-1
=== modified file 'dir.py'
--- a/dir.py	2008-09-01 15:42:59 +0000
+++ b/dir.py	2008-09-06 13:42:22 +0000
@@ -18,6 +18,7 @@
 
 import git, os
 
+import bzrlib
 from bzrlib.lazy_import import lazy_import
 from bzrlib import (
     bzrdir,
@@ -112,8 +113,11 @@
             return workingtree.GitWorkingTree(self, self.open_repository(), 
                                                   self.open_branch())
 
-    def cloning_metadir(self):
-        return bzrdir.BzrDirFormat.get_default_format()
+    def cloning_metadir(self, stacked=False):
+        if stacked:
+            return bzrlib.bzrdir.format_registry.make_bzrdir("pack-0.92")
+        else:
+            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6")
 
     def create_repository(self, shared=False):
         return self.open_repository()