planex-patchqueue: archive patchqueue repositories directly, rather than extracting patches

Signed-off-by: Euan Harris <euan.harris@citrix.com>

Author: euanh

planex/cmd/clone.py

@@ -68,24 +68,21 @@ def main(argv=None):
                                                credentials=args.credentials)
 
         else:
-            if pin.base:
+            print "Cloning %s" % pin.url
+            util.makedirs(os.path.dirname(checkoutdir))
+            clone(pin.url, checkoutdir, pin.commitish)
+
+            if pin.base is not None:
                 base_reponame = os.path.basename(pin.base).rsplit(".git")[0]
                 base_checkoutdir = os.path.join(args.repos, base_reponame)
                 print "Cloning %s" % pin.base
                 util.makedirs(os.path.dirname(base_checkoutdir))
                 clone(pin.base, base_checkoutdir, pin.base_commitish)
 
-                print "Cloning %s" % pin.url
-                reponame = os.path.basename(pin.url).rsplit(".git")[0]
-                checkoutdir = os.path.join(args.repos, reponame)
-                clone(pin.url, checkoutdir, pin.commitish)
-
                 # Symlink the patchqueue
                 patch_path = os.path.join(base_checkoutdir, ".git/patches")
-                util.makedirs(patch_path)
-
                 link_path = os.path.relpath(checkoutdir, patch_path)
-
+                util.makedirs(patch_path)
                 os.symlink(os.path.join(link_path, pin.patchqueue),
                            os.path.join(patch_path, pin.base_commitish))
 
@@ -94,14 +91,10 @@ def main(argv=None):
                 fileh = open(status, 'w')
                 fileh.close()
 
+                # Push patchqueue
                 subprocess.check_call(['guilt', 'push', '--all'],
                                       cwd=base_checkoutdir)
 
-            else:
-                print "Cloning %s" % pin.url
-                util.makedirs(os.path.dirname(checkoutdir))
-                clone(pin.url, checkoutdir, pin.commitish)
-
 
 if __name__ == "__main__":
     main()

planex/cmd/patchqueue.py

@@ -6,6 +6,7 @@
 import argparse
 import os
 import shutil
+import sys
 import tempfile
 from urlparse import urlparse
 
@@ -61,20 +62,18 @@ def assemble_extra_sources(tmpdir, link, sources, patches):
     Assemble the non-patchqueue sources in the working directory.
     """
     if link.specfile is not None:
-        source_path = os.path.join(link.url, ".git/patches", link.specfile)
+        source_path = os.path.join(link.url, link.specfile)
         copy_to_tmpdir(tmpdir, source_path, link.specfile)
 
     if link.sources is not None:
         for source in sources:
-            source_path = os.path.join(link.url, ".git/patches",
-                                       link.sources, source)
+            source_path = os.path.join(link.url, link.sources, source)
             dest_path = os.path.join(link.sources, source)
             copy_to_tmpdir(tmpdir, source_path, dest_path)
 
     if link.patches is not None:
         for patch in patches:
-            source_path = os.path.join(link.url, ".git/patches",
-                                       link.patches, patch)
+            source_path = os.path.join(link.url, link.patches, patch)
             dest_path = os.path.join(tmpdir, link.patches, patch)
             copy_to_tmpdir(tmpdir, source_path, dest_path)
 
@@ -99,12 +98,17 @@ def main(argv=None):
         reponame = os.path.basename(url.path).rsplit(".git")[0]
         repo = os.path.join(args.repos, reponame)
 
+    if repo.endswith(".pg"):
+        util.makedirs(os.path.dirname(args.tarball))
+        git.archive(repo, end_tag, args.tarball)
+        sys.exit(0)
+
     # Start tag is based on the version specified in the spec file,
     # but the tag name may be slightly different (v1.2.3 rather than 1.2.3)
     # If the link file does not list a spec file, assume that there is one in
     # the usual place
     if link.specfile is not None:
-        spec_path = os.path.join(link.url, ".git/patches", link.specfile)
+        spec_path = os.path.join(repo, link.specfile)
     else:
         basename = os.path.splitext(os.path.basename(args.link))[0]
         spec_path = os.path.join("SPECS", "%s.spec" % basename)

planex/git.py

@@ -58,21 +58,18 @@ def describe(repo, treeish="HEAD"):
     return description[matchlen:].replace('-', '+')
 
 
-def archive(repo, commit_hash, prefix, target_dir):
+def archive(repo, commit_hash, output, prefix=None):
     """
     Archive a git repo at a given commit with a specified version prefix.
-    Returns the path to a tar.gz to be used as a source for building an RPM.
+    Returns the path to an archive to be used as a source for building an RPM.
     """
     dotgitdir = dotgitdir_of_path(repo)
 
-    prefix = "%s-%s" % (os.path.basename(repo), prefix)
-    path = os.path.join(target_dir, "%s.tar" % prefix)
-
-    run(["git", "--git-dir=%s" % dotgitdir, "archive", commit_hash,
-         "--prefix=%s/" % prefix, "-o", path])
-    run(["gzip", "--no-name", "-f", path])
-
-    return path + ".gz"
+    cmd = ["git", "--git-dir=%s" % dotgitdir, "archive", commit_hash,
+           "-o", output]
+    if prefix is not None:
+        cmd += ["--prefix=%s-%s/" % (os.path.basename(repo), prefix)]
+    run(cmd)
 
 
 def tags(repo):