Merge lp:~harlowja/cloud-init/cloud-init-git-tarball-make into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

Make tools/make-tarball work under existence of a .git directory (or a .bzr one).

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:1146
https://server-team-jenkins.canonical.com/job/cloud-init-ci/45/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/lp-vote-on-merge/19/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/cloud-init-ci/45/rebuild

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

Hello,
Thank you for taking the time to contribute to cloud-init. Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html .

Note, I think the general intent of this patch is already in trunk.

Unmerged revisions

1146. By Joshua Harlow on 2015-09-16

Allow make-tarball to function under git usage

=== modified file 'tools/make-tarball'
--- tools/make-tarball	2014-02-28 21:19:19 +0000
+++ tools/make-tarball	2015-09-16 22:03:26 +0000
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 set -e
 
 find_root() {
@@ -18,22 +19,33 @@
     exit 1;
 fi
 
-REVNO=$(bzr revno "$ROOT_DIR")
+if [ -d "$ROOT_DIR/.git" ]; then
+    VERSION=$(cd $ROOT_DIR && python setup.py --version)
+    REVPOSTFIX=""
+else
+    REVNO=$(bzr revno "$ROOT_DIR")
+    REVPOSTFIX="~bzr$REVNO"
+    VERSION=$("$ROOT_DIR/tools/read-version")
+fi
 
 if [ ! -z "$1" ]; then
     ARCHIVE_FN="$1"
 else
-    VERSION=$("$ROOT_DIR/tools/read-version")
-    ARCHIVE_FN="$PWD/cloud-init-$VERSION~bzr$REVNO.tar.gz"
-fi
-
-export_uncommitted=""
-if [ "${UNCOMMITTED:-0}" != "0" ]; then
-   export_uncommitted="--uncommitted"
-fi
-
-bzr export ${export_uncommitted} \
-   --format=tgz --root="cloud-init-$VERSION~bzr$REVNO" \
-    "--revision=${REVNO}" "${ARCHIVE_FN}" "$ROOT_DIR"
+    ARCHIVE_FN="$PWD/cloud-init-${VERSION}${REVPOSTFIX}.tar.gz"
+fi
+
+if [ -d "$ROOT_DIR/.git" ]; then
+    git_hash=$(cd $ROOT_DIR &&  git log --pretty=format:'%h' -n 1)
+    cd $ROOT_DIR && git archive -o "$ARCHIVE_FN" \
+                    --prefix="cloud-init-${VERSION}${REVPOSTFIX}/" "$git_hash"
+else
+    export_uncommitted=""
+    if [ "${UNCOMMITTED:-0}" != "0" ]; then
+       export_uncommitted="--uncommitted"
+    fi
+    bzr export ${export_uncommitted} \
+       --format=tgz --root="cloud-init-${VERSION}${REVPOSTFIX}" \
+        "--revision=${REVNO}" "${ARCHIVE_FN}" "$ROOT_DIR"
+fi
 
 echo "$ARCHIVE_FN"