Rev 108: Support bzr init --git. in http://people.samba.org/bzr/jelmer/bzr-git/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 108
revision-id: jelmer at samba.org-20080901154259-clh6u0nr5ubr3d2m
parent: jelmer at samba.org-20080830192338-37xjy7dayiuv7io9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-09-01 17:42:59 +0200
message:
  Support bzr init --git.
modified:
  __init__.py                    __init__.py-20060715102359-vayyec84yioge4ok-1
  dir.py                         git_dir.py-20071108234408-ygidvy5hviixghsd-1
  repository.py                  git_repository.py-20071108234408-ygidvy5hviixghsd-2
  tests/test_blackbox.py         test_blackbox.py-20071228193717-18el6d8x4qddug3w-1
=== modified file '__init__.py'
--- a/__init__.py	2008-08-23 13:12:10 +0000
+++ b/__init__.py	2008-09-01 15:42:59 +0000
@@ -23,8 +23,8 @@
 
 bzrdir.format_registry.register(
     'git', GitBzrDirFormat,
-    help='GIT - the stupid content tracker.',
-    native=False, hidden=True, experimental=True,
+    help='GIT repository.', 
+    native=False, experimental=True,
     )
 
 bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)

=== modified file 'dir.py'
--- a/dir.py	2008-08-23 13:12:10 +0000
+++ b/dir.py	2008-09-01 15:42:59 +0000
@@ -16,7 +16,7 @@
 
 """An adapter between a Git control dir and a Bazaar BzrDir"""
 
-import git
+import git, os
 
 from bzrlib.lazy_import import lazy_import
 from bzrlib import (
@@ -26,6 +26,7 @@
     )
 
 lazy_import(globals(), """
+from bzrlib.lockable_files import TransportLock
 from bzrlib.plugins.git import (
     errors,
     branch,
@@ -114,11 +115,15 @@
     def cloning_metadir(self):
         return bzrdir.BzrDirFormat.get_default_format()
 
+    def create_repository(self, shared=False):
+        return self.open_repository()
+
 
 class GitBzrDirFormat(bzrdir.BzrDirFormat):
     """The .git directory control format."""
 
     _gitdir_class = GitDir
+    _lock_class = TransportLock
 
     @classmethod
     def _known_formats(self):
@@ -159,5 +164,19 @@
     def get_format_description(self):
         return "Local Git Repository"
 
+    def get_format_string(self):
+        return "Local Git Repository"
+
+    def initialize_on_transport(self, transport):
+        from bzrlib.transport.local import LocalTransport
+
+        if not isinstance(transport, LocalTransport):
+            raise NotImplementedError(self.initialize, 
+                "Can't create Git Repositories/branches on "
+                "non-local transports")
+
+        git.repo.Repo.create(transport.local_abspath(".")) 
+        return self.open(transport)
+
 
 bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)

=== modified file 'repository.py'
--- a/repository.py	2008-08-30 18:35:51 +0000
+++ b/repository.py	2008-09-01 15:42:59 +0000
@@ -167,6 +167,9 @@
         assert revision_id != None
         return self.revision_tree(revision_id).inventory
 
+    def set_make_working_trees(self, trees):
+        pass
+
 
 def escape_file_id(file_id):
     return file_id.replace('_', '__').replace(' ', '_s')

=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py	2008-08-23 17:46:07 +0000
+++ b/tests/test_blackbox.py	2008-09-01 15:42:59 +0000
@@ -62,6 +62,9 @@
         self.assertEqual(error, '')
         self.assertEqual(output, "a\n")
 
+    def test_init(self):
+        self.run_bzr("init-repo --git repo") 
+
     def test_info_verbose(self):
         self.simple_commit()