Merge lp:~tsimonq2/ubuntu-archive-tools/change-default-branch-when-branch-made-git into lp:ubuntu-archive-tools

[Simon Quigley]

This is related to the merge proposal that was made earlier today, so adding Steve as a reviewer, but I made this a separate MP for a couple of reasons:
 1. The nature of the change is a bit different, and if discussion is needed, is likely different than the discussions needed in the other MP.
 2. I wanted to get the other MP done and merged so there's a basis; the default branch could always be changed manually pretty easily, but doing it automatically is a bit of an enhancement.
 3. I was having some problems working with launchpadlib that were since solved in #launchpad, thanks nacc and cjwatson!

Here's what this actually does:
 1. It adds Git support to the already existing remote_branch function, and does it in the same sort of way as Bazaar (I would be happy to figure out how to convert these to the respective Python libraries if the reviewers think it would be a good prerequisite to merging). This also adds an additional argument to be passed, and it's used in a way that would allow passing of the existing vcs variable, to not overcomplicate things.
 2. This uses https://git.launchpad.net/usd-importer/tree/gitubuntu/importer.py#n374 and on as a starting point to programatically change the default branch of the Git repository we're pushing to to the new branch it's creating, with the goal to always have the default branch be the development release. This shouldn't break if flavors always follow the lp:~TEAM/ubuntu-seeds/+git/FLAVOR convention and they do something like lp:~TEAM/+git/FLAVOR but I think that having flavors follow that consistent convention should be mandatory anyways.
 3. This changes the Launchpad API login to using the devel interface, because after discussing with cjwatson in #launchpad it was determined that the Git API functions aren't exposed on anything but devel. Should I leave a code comment?

Thanks.

[Colin Watson (cjwatson)]

No need for a comment regarding using the devel API version; that should be normal practice for most new scripts anyway.

[Simon Quigley (tsimonq2)]

> No need for a comment regarding using the devel API version; that should be
> normal practice for most new scripts anyway.

Ok, cool.

[Colin Watson (cjwatson)]

review: Needs Fixing

[lp:~tsimonq2/ubuntu-archive-tools/change-default-branch-when-branch-made-git]

1145. By Simon Quigley on 2018-01-17

Split remote_branch into two different functions dependent on the VCS.

1146. By Simon Quigley on 2018-01-17

Make adjustments from Colin's suggestions.

1147. By Simon Quigley on 2018-01-17

Add additional code tweaks.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'branch-seeds'
--- branch-seeds	2018-01-08 22:05:09 +0000
+++ branch-seeds	2018-01-17 03:34:29 +0000
@@ -45,7 +45,7 @@
             return None
 
 
-def remote_branch(source):
+def remote_bzr_branch(source):
     # TODO: should really use bzrlib instead
     info = subprocess.check_output(
         ["bzr", "info", source], universal_newlines=True)
@@ -55,6 +55,14 @@
     else:
         raise Exception("Unable to find remote branch for %s" % source)
 
+def remote_git_repository(source, srcbranch):
+    fullbranch = subprocess.check_output(
+        ["git", "rev-parse", "--symbolic-full-name", srcbranch+"@{upstream}"],
+        universal_newlines=True, cwd=source)
+    return subprocess.check_output(
+        ["git", "ls-remote", "--get-url", fullbranch.split("/")[2]],
+        universal_newlines=True, cwd=source)
+
 
 def lp_branch(options, url):
     return options.launchpad.branches.getByUniqueName(
@@ -68,7 +76,7 @@
     if vcs:
         if vcs is VCS.Bazaar:
             subprocess.check_call(["bzr", "up", source])
-            remote_source = remote_branch(source)
+            remote_source = remote_bzr_branch(source)
             remote_dest = os.path.join(os.path.dirname(remote_source), dest)
             subprocess.check_call(["bzr", "branch", source, dest])
             subprocess.check_call(["bzr", "push", "-d", dest, remote_dest])
@@ -120,6 +128,15 @@
                 subprocess.check_call(
                     ["git", "push", "origin", options.dest_series], cwd=dest)
 
+                remote = remote_git_repository(dest, options.source_series)
+                if "git.launchpad.net" in remote:
+                    lp_git_repo = options.launchpad.git_repositories.getByPath(
+                                  path=urlparse(remote).path.lstrip("/").rstrip("\n"))
+                    lp_git_repo.default_branch = options.dest_series
+                    lp_git_repo.lp_save()
+                else:
+                    raise Exception("Git remote URL must be on git.launchpad.net.")
+
 
 def main():
     parser = OptionParser(usage="usage: %prog [options] collection ...")
@@ -136,7 +153,7 @@
         parser.error("You must specify at least one seed collection.")
 
     options.launchpad = Launchpad.login_with(
-        "branch-seeds", options.launchpad_instance)
+        "branch-seeds", options.launchpad_instance, version="devel")
 
     distro = options.launchpad.distributions["ubuntu"]
     if options.source_series is None: