Merge lp:~jelmer/bzr-builddeb/directory-git into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

Now that bzr-git supports retrieving remote git branches, it is possible
to support Vcs-Git in bzr-builddeb. The attached patch updates the
directory service to do this, similar to the way it's done for bzr-svn.

Cheers,

Jelmer
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

[James Westby (james-w)]

On Fri, 2009-01-30 at 04:42 +0000, Jelmer Vernooij wrote:
> Now that bzr-git supports retrieving remote git branches, it is possible
> to support Vcs-Git in bzr-builddeb. The attached patch updates the
> directory service to do this, similar to the way it's done for bzr-svn.

Looks good to me, thanks.

Also, thanks for your work on bzr-git, I'll have to try this out for
myself.

Thanks,

James

=== modified file 'directory.py'
--- directory.py	2008-08-29 17:34:06 +0000
+++ directory.py	2009-01-30 04:38:21 +0000
@@ -76,5 +76,15 @@
             else:
                 return urls[version]["Svn"]
 
+        if "Git" in urls[version]:
+            try:
+                import bzrlib.plugins.git
+            except ImportError:
+                info("This package uses git. If you would like to "
+                        "access it with bzr then please install bzr-git "
+                        "and re-run the command.")
+            else:
+                return urls[version]["Git"]
+
         raise errors.InvalidURL(path=url,
             extra='unsupported VCSes %r found' % urls[version].keys())