Merge lp:~chris-gondolin/charm-helpers/fetch-bzr-revnos into lp:charm-helpers

[Chris Stratford]

Adds the option to specify a revno when fetching from a bzr repo.

Updated and resubmitted, since the code the original merge request was made against (8 months ago) has now changed.

[Stuart Bishop (stub)]

Looks fine, but there is no test for the new arguments. I've added the trivial test, which demonstrated a bug (revno needs to be cast to a string), which I have also fixed.

review: Approve

=== modified file 'charmhelpers/fetch/bzrurl.py'
--- charmhelpers/fetch/bzrurl.py	2015-12-10 21:01:00 +0000
+++ charmhelpers/fetch/bzrurl.py	2016-03-23 17:06:53 +0000
@@ -42,15 +42,23 @@
         else:
             return True
 
-    def branch(self, source, dest):
+    def branch(self, source, dest, revno=None):
         if not self.can_handle(source):
             raise UnhandledSource("Cannot handle {}".format(source))
+        cmd_opts = []
+        if revno:
+            cmd_opts += ['-r', revno]
         if os.path.exists(dest):
-            check_call(['bzr', 'pull', '--overwrite', '-d', dest, source])
+            cmd = ['bzr', 'pull']
+            cmd += cmd_opts
+            cmd += ['--overwrite', '-d', dest, source]
         else:
-            check_call(['bzr', 'branch', source, dest])
+            cmd = ['bzr', 'branch']
+            cmd += cmd_opts
+            cmd += [source, dest]
+        check_call(cmd)
 
-    def install(self, source, dest=None):
+    def install(self, source, dest=None, revno=None):
         url_parts = self.parse_url(source)
         branch_name = url_parts.path.strip("/").split("/")[-1]
         if dest:
@@ -62,7 +70,7 @@
         if not os.path.exists(dest_dir):
             mkdir(dest_dir, perms=0o755)
         try:
-            self.branch(source, dest_dir)
+            self.branch(source, dest_dir, revno)
         except OSError as e:
             raise UnhandledSource(e.strerror)
         return dest_dir