Merge lp:~marcoceppi/juju-deployer/local-branches into lp:juju-deployer/darwin

[Marco Ceppi]

Allow locally sourced VCS branches as charms

This allows a charm to be set to a local bzr or git version controlled directory

[Kapil Thangavelu (hazmat)]

looks good, merged.

review: Approve

=== modified file 'deployer/charm.py'
--- deployer/charm.py	2013-07-23 19:39:11 +0000
+++ deployer/charm.py	2013-08-21 07:32:27 +0000
@@ -33,9 +33,11 @@
     def get_vcs(self):
         if not self.branch:
             return None
-        if self.branch.startswith('git') or 'github.com' in self.branch:
+        if self.branch.startswith('git') or 'github.com' in self.branch or \
+                os.path.exists(os.path.join(self.branch, '.git')):
             return Git(self.path, self.branch, self.log)
-        elif self.branch.startswith("bzr") or self.branch.startswith('lp:'):
+        elif self.branch.startswith("bzr") or self.branch.startswith('lp:') \
+                or os.path.exists(os.path.join(self.branch, '.bzr')):
             return Bzr(self.path, self.branch, self.log)
 
     @classmethod