Merge lp:~james-page/juju-deployer/git-cwd into lp:juju-deployer

[James Page]

Improve git support

1) ensure the cwd is set correctly when clone repositories (inline with bzr)

2) git.launchpad.net as a recognised git repository location

[Tim Van Steenburgh (tvansteenburgh)]

LGTM, thanks James.

review: Approve

=== modified file 'deployer/charm.py'
--- deployer/charm.py	2014-09-30 19:26:26 +0000
+++ deployer/charm.py	2015-07-21 08:05:37 +0000
@@ -33,6 +33,7 @@
         if not self.branch:
             return None
         if self.branch.startswith('git') or 'github.com' in self.branch or \
+                'git.launchpad.net' 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:') \

=== modified file 'deployer/vcs.py'
--- deployer/vcs.py	2014-09-29 14:36:34 +0000
+++ deployer/vcs.py	2015-07-21 08:05:37 +0000
@@ -100,7 +100,10 @@
 
     def branch(self):
         params = ["git", "clone", "--depth", "1", self.origin, self.path]
-        self._call(params, self.err_branch, os.path.dirname(self.path))
+        cwd = os.path.dirname(os.path.dirname(self.path))
+        if not cwd:
+            cwd = "."
+        self._call(params, self.err_branch, cwd)
 
     def is_modified(self):
         params = ["git", "status", "-s"]