Merge lp:~abentley/charms/precise/juju-reports/local-pull into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Avoid overwriting source by pulling with --local.

I introduced branch binding to make committing easier when developing in a local deploy. Unfortunately, this also affects pull. It means that the pull performed by the charm can overwrite the contents of the current bound branch with the contents of the target branch.

This change ensures that pulls are local, so they do not overwrite the bound-to branch. In order to use --local, the branch must be bound, so "bzr bind" is issued before "bzr pull". Even though the branch is bound to the pulled-from branch, --local is used so that setting the revno does not remove revisions from the pulled-from branch.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-07-08 20:55:54 +0000
+++ hooks/common.py	2014-07-11 14:02:58 +0000
@@ -110,15 +110,16 @@
 
 
 def update_source(source_url, revno):
+    # Make it easier to develop on a deploy
+    call_bzr(['bind', '-d', PROJECT_DIR, source_url])
+
     # Grab the code
     revno = 'revno:%s' % revno
+
     bzr_cmd = ['pull', '--overwrite', source_url, '-r', revno, '-d',
-               PROJECT_DIR, '--remember']
+               PROJECT_DIR, '--remember', '--local']
     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.
     call_bzr(['revert', os.path.join(PROJECT_DIR, 'resources')])