Merge lp:~abentley/charms/precise/juju-reports/bind-branch into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Bind the branch when updating source code.

This updates the charm to bind the local branch to the remote branch, so that commits go to the remote branch. This is helpful for development. I already bind the branch on my deploy, but this ensures it's properly updated every time.

It also centralizes bzr calls, and ensures that --no-aliases is used, which is a best practice.

[Curtis Hovey (sinzui)]

Thank you

review: Approve (code)

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-06-06 14:16:14 +0000
+++ hooks/common.py	2014-06-18 14:29:13 +0000
@@ -100,18 +100,26 @@
     with open_secret(ubuntu_path, pwd.pw_uid, pwd.pw_gid) as key_file:
         key_file.write(ssh_key)
     # Login to LP
-    subprocess.check_call(['bzr', 'lp-login', 'juju-qa-bot'])
+    call_bzr(['lp-login', 'juju-qa-bot'])
+
+
+def call_bzr(args):
+    args = ['bzr', '--no-aliases'] + args
+    return subprocess.check_call(args)
 
 
 def update_source(source_url, revno):
     # Grab the code
     revno = 'revno:%s' % revno
-    bzr_cmd = ['bzr', 'pull', '--overwrite', source_url, '-r', revno, '-d',
+    bzr_cmd = ['pull', '--overwrite', source_url, '-r', revno, '-d',
                PROJECT_DIR, '--remember']
-    subprocess.check_call(bzr_cmd)
+    call_bzr(bzr_cmd)
+
+    # Make it easier to develop on a deploy
+    call_bzr(['bind', '-d', PROJECT_DIR, source_url])
+
     # Restore the templates if they are missing/altered.
-    subprocess.check_call(['bzr', 'revert',
-                           os.path.join(PROJECT_DIR, 'resources')])
+    call_bzr(['revert', os.path.join(PROJECT_DIR, 'resources')])
 
 
 def install_production(dist_clean):