From 2ddc572d7962e03258cffe12890d3c3008d9fec9 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@ubuntu.com>
Date: Thu, 5 Mar 2009 15:14:21 +0000
Subject: [PATCH] * Added grab-merge from merges.ubuntu.com and made necessary
 changes to install   it.

---
 debian/changelog |   5 ++-
 debian/copyright |   1 +
 grab-merge       | 101 +++++++++++++++++++++++++++++++++++++++++++++++
 setup.py         |   1 +
 4 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100755 grab-merge

diff --git a/debian/changelog b/debian/changelog
index 5321a5a..7586cb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,10 @@ ubuntu-dev-tools (0.66) UNRELEASED; urgency=low
   * debian/copyright:
     - Update my copyright information
 
- -- Nathan Handler <nhandler@ubuntu.com>  Wed, 04 Mar 2009 22:35:44 +0000
+  [ Jonathan Davies ]
+  * Added grab-merge from merges.ubuntu.com (LP: #155098).
+
+ -- Jonathan Davies <jpds@ubuntu.com>  Thu, 05 Mar 2009 15:11:19 +0000
 
 ubuntu-dev-tools (0.65) jaunty; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index dc71389..e097266 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,6 +18,7 @@ Upstream Authors:
     Matt Zimmerman <mdz@ubuntu.com>
 	Michael Bienia <geser@ubuntu.com>
 	Pete Savage <petesavage@ubuntu.com>
+    Scott James Remnant <scott@ubuntu.com>
 	Siegfried-A. Gevatter <rainct@ubuntu.com>
 	Soren Hansen <soren@ubuntu.com>
 	Steve Kowalik <stevenk@ubuntu.com>
diff --git a/grab-merge b/grab-merge
new file mode 100755
index 0000000..70aa88a
--- /dev/null
+++ b/grab-merge
@@ -0,0 +1,101 @@
+#!/bin/sh
+# grab-merge - grab a merge
+#
+# Copyright © 2008 Canonical Ltd.
+# Author: Scott James Remnant <scott@ubuntu.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of version 3 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Uncomment if you have an account on casey
+#RSYNC=y
+
+# Uncomment if you know that this deletes all the files in the CWD
+#EXPERT=y
+
+# Or uncomment if you want to use named subdirectories
+SUBDIR=y
+
+set -e
+
+MERGE=$1
+
+if [ "$SUBDIR" = "y" ]; then
+    [ -d "$MERGE" ] || mkdir $MERGE
+    cd $MERGE
+fi
+
+if [ "$EXPERT" != "y" ] && [ -n "$(ls)" ]; then
+    echo -n "Sure you want to delete all the files in $(pwd) [yn]? "
+    read ANSWER
+    [ $ANSWER = y ]
+fi
+
+if [ "${MERGE#lib}" != "${MERGE}" ]; then
+    HASH=${MERGE%${MERGE#????}}
+else
+    HASH=${MERGE%${MERGE#?}}
+fi
+
+if [ "$RSYNC" = "y" ]; then
+    rsync --verbose --archive --progress --compress --delete \
+	merges.ubuntu.com:/srv/patches.ubuntu.com/merges/$HASH/$MERGE/ .
+else
+    rm -rf  *
+    wget -q https://merges.ubuntu.com/$HASH/$MERGE/REPORT
+
+    for NAME in $(sed -n -e "/^    /p" REPORT); do
+	echo "Getting $NAME..."
+	[ -f $NAME ] || wget -q https://merges.ubuntu.com/$HASH/$MERGE/$NAME
+    done
+fi
+echo
+
+if grep "^generated: " REPORT >/dev/null; then
+    VERSION=$(sed -n -e "/^generated:/s/^generated: *//p" REPORT)
+    dpkg-source -x ${MERGE}_${VERSION#*:}.dsc
+    echo
+else
+    TARBALL=$(sed -n -e "/\.src\.tar\.gz$/p" REPORT)
+
+    echo unpacking $TARBALL
+    tar xf $TARBALL
+    echo
+fi
+
+if grep "^  C" REPORT; then
+    echo
+fi
+
+echo "#!/bin/sh" > merge-genchanges
+echo "exec $(sed -n -e '/^  $ /s/^  $ //p' REPORT) \"\$@\"" \
+    >> merge-genchanges
+chmod +x merge-genchanges
+
+echo "#!/bin/sh" > merge-buildpackage
+echo "exec $(sed -n -e '/^  $ /s/^  $ dpkg-genchanges/dpkg-buildpackage/p' REPORT) \"\$@\"" \
+    >> merge-buildpackage
+chmod +x merge-buildpackage
+
+echo "Run ../merge-genchanges or ../merge-buildpackage when done"
+
+if grep "^Vcs-" *.dsc >/dev/null; then
+    echo
+    echo "*** WARNING ***"
+    echo
+    echo "It looks like this package is maintained in revision control:"
+    echo
+    grep "^Vcs-" *.dsc
+    echo
+    echo "You almost certainly don't want to continue without investigating."
+    exit 1
+fi
diff --git a/setup.py b/setup.py
index cc5f99a..f6543c4 100755
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@ setup(name='ubuntu-dev-tools',
                'get-branches',
                'get-build-deps',
                'grab-attachments',
+               'grab-merge',
                'hugdaylist',
                'lp-set-dup',
                'manage-credentials',