Merge lp:~tsimonq2/ubuntu-archive-tools/add-git-support-to-branch-seeds into lp:ubuntu-archive-tools

[Simon Quigley]

This has the same sort of purpose as https://code.launchpad.net/~tsimonq2/ubuntu-cdimage/add-git-support-to-germinate/+merge/335604 and that is to add support for Lubuntu's move to having our seed in a Git repository instead of one managed under Bazaar.

Adding Steve as a reviewer because he reviewed the other MP.

[Steve Langasek (vorlon)]

Requesting a few changes, mostly stylistic.

review: Needs Fixing

[lp:~tsimonq2/ubuntu-archive-tools/add-git-support-to-branch-seeds]

1137. By Colin Watson on 2018-01-05

copy-build-scheduler: convert to argparse

1138. By Colin Watson on 2018-01-05

copy-build-scheduler: switch to Python 3

1139. By Colin Watson on 2018-01-05

copy-build-scheduler: skip inactive builders

1140. By Colin Watson on 2018-01-05

lputils.py: use argparse-style naming (no functional change)

1141. By Colin Watson on 2018-01-05

copy-package: convert to argparse

1142. By Colin Watson on 2018-01-05

manage-chroot: convert to argparse

[lp:~tsimonq2/ubuntu-archive-tools/add-git-support-to-branch-seeds]

1143. By Simon Quigley on 2018-01-07

Add Git support to branch-seeds.

1144. By Simon Quigley on 2018-01-07

Refactor some changes after feedback from slangasek.

[Steve Langasek (vorlon)]

another round of minor changes

review: Needs Fixing

[lp:~tsimonq2/ubuntu-archive-tools/add-git-support-to-branch-seeds]

1145. By Simon Quigley on 2018-01-08

Reduce to if vcs, rest of that if/else isn't needed.

[Simon Quigley (tsimonq2)]

How's that, Steve?

=== modified file 'branch-seeds'
--- branch-seeds	2012-08-01 09:47:07 +0000
+++ branch-seeds	2018-01-08 22:05:31 +0000
@@ -29,6 +29,20 @@
     from urlparse import urlparse
 
 from launchpadlib.launchpad import Launchpad
+from enum import Enum
+
+class VCS(Enum):
+    Git = 1
+    Bazaar = 2
+
+    @staticmethod
+    def detect_vcs(source):
+        if os.path.exists(os.path.join(source, ".git")):
+            return VCS.Git
+        elif os.path.exists(os.path.join(source, ".bzr")):
+            return VCS.Bazaar
+        else:
+            return None
 
 
 def remote_branch(source):
@@ -50,21 +64,28 @@
 def branch(options, collection):
     source = "%s.%s" % (collection, options.source_series)
     dest = "%s.%s" % (collection, options.dest_series)
-    if os.path.exists(source):
-        subprocess.check_call(["bzr", "up", source])
-        remote_source = remote_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])
-        subprocess.check_call(["bzr", "bind", ":push"], cwd=dest)
-
-        lp_source = lp_branch(options, remote_source)
-        lp_source.lifecycle_status = "Mature"
-        lp_source.lp_save()
-
-        lp_dest = lp_branch(options, remote_dest)
-        lp_dest.lifecycle_status = "Development"
-        lp_dest.lp_save()
+    vcs = VCS.detect_vcs(source)
+    if vcs:
+        if vcs is VCS.Bazaar:
+            subprocess.check_call(["bzr", "up", source])
+            remote_source = remote_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])
+            subprocess.check_call(["bzr", "bind", ":push"], cwd=dest)
+
+            lp_source = lp_branch(options, remote_source)
+            lp_source.lifecycle_status = "Mature"
+            lp_source.lp_save()
+
+            lp_dest = lp_branch(options, remote_dest)
+            lp_dest.lifecycle_status = "Development"
+            lp_dest.lp_save()
+        elif vcs is VCS.Git:
+            subprocess.check_call(["git", "fetch"], cwd=source)
+            subprocess.check_call(["git", "reset", "--hard", "FETCH_HEAD"], cwd=source)
+            os.rename(source, dest)
+            subprocess.check_call(["git", "checkout", "-b", options.dest_series], cwd=dest)
 
         re_include_source = re.compile(
             r"^(include )(.*)\.%s" % options.source_series)
@@ -89,8 +110,15 @@
             os.rename(
                 os.path.join(dest, "STRUCTURE.new"),
                 os.path.join(dest, "STRUCTURE"))
-            subprocess.check_call(
-                ["bzr", "commit", "-m", "; ".join(message)], cwd=dest)
+            if vcs is VCS.Bazaar:
+                subprocess.check_call(
+                    ["bzr", "commit", "-m", "; ".join(message)], cwd=dest)
+            elif vcs is VCS.Git:
+                subprocess.check_call(["git", "add", "STRUCTURE"], cwd=dest)
+                subprocess.check_call(
+                    ["git", "commit", "-m", "; ".join(message)], cwd=dest)
+                subprocess.check_call(
+                    ["git", "push", "origin", options.dest_series], cwd=dest)
 
 
 def main():