Merge lp:~dooferlad/linaro-license-protection/just_use_bzr into lp:~linaro-automation/linaro-license-protection/trunk

[James Tunnicliffe]

Removed use of bzrlib - just using bzr commands.

[Данило Шеган (danilo)]

Too fast:

$ scripts/update-deployment.py -vvv settings_staging_snapshots
2012-08-23 20:35:24,791 DEBUG: stdout:
Using saved parent location: http://bazaar.launchpad.net/~linaro-infrastructure/linaro-license-protection/trunk/
 Now on revision 116.
2012-08-23 20:35:24,792 DEBUG: stderr:
 M scripts/linaroscript.py
  M scripts/update-deployment.py
 All changes applied successfully.
Traceback (most recent call last):
  File "scripts/update-deployment.py", line 137, in <module>
    script.run()
  File "/home/danilo/linaro/linaro-license-protection/just_use_bzr/scripts/linaroscript.py", line 45, in run
    self.work()
  File "scripts/update-deployment.py", line 124, in work
    self.refresh_branch(code_root)
  File "scripts/update-deployment.py", line 66, in refresh_branch
    self.run_subcommand(["bzr", "up"], working_tree_dir)
NameError: global name 'working_tree_dir' is not defined

Should be s/working_tree_dir/branch_dir/.

Approved with that caveat.

review: Approve

[lp:~dooferlad/linaro-license-protection/just_use_bzr]

119. By James Tunnicliffe on 2012-08-23

Fix broken name.

=== modified file 'scripts/update-deployment.py'
--- scripts/update-deployment.py	2012-08-23 17:13:58 +0000
+++ scripts/update-deployment.py	2012-08-23 18:46:23 +0000
@@ -34,8 +34,6 @@
 
 """
 
-import bzrlib.branch
-import bzrlib.workingtree
 import os
 import subprocess
 
@@ -64,25 +62,8 @@
 
     def refresh_branch(self, branch_dir):
         """Refreshes a branch checked-out to a branch_dir."""
-
-        code_branch = bzrlib.branch.Branch.open(branch_dir)
-        parent_branch = bzrlib.branch.Branch.open(
-            code_branch.get_parent())
-        result = code_branch.pull(source=parent_branch)
-        if result.old_revno != result.new_revno:
-            self.logger.info("Updated %s from %d to %d.",
-                             branch_dir, result.old_revno, result.new_revno)
-        else:
-            self.logger.info(
-                "No changes to pull from %s.", code_branch.get_parent())
-        self.logger.debug("Updating working tree in %s.", branch_dir)
-        self.update_tree(branch_dir)
-        return code_branch
-
-    def update_tree(self, working_tree_dir):
-        """Does a checkout update."""
-        code_tree = bzrlib.workingtree.WorkingTree.open(working_tree_dir)
-        code_tree.update()
+        self.run_subcommand(["bzr", "pull"], branch_dir)
+        self.run_subcommand(["bzr", "up"], branch_dir)
 
     def run_subcommand(self, arguments, cwd=None):
         process = subprocess.Popen(arguments, cwd=cwd, stdout=subprocess.PIPE,