From owner-svn-soc-all@FreeBSD.ORG  Fri Jul 18 08:52:00 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BE583203
 for <svn-soc-all@FreeBSD.org>; Fri, 18 Jul 2014 08:52:00 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ABCEE2B2B
 for <svn-soc-all@FreeBSD.org>; Fri, 18 Jul 2014 08:52:00 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6I8q0pP014536
 for <svn-soc-all@FreeBSD.org>; Fri, 18 Jul 2014 08:52:00 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s6I8q096014383
 for svn-soc-all@FreeBSD.org; Fri, 18 Jul 2014 08:52:00 GMT
 (envelope-from op@FreeBSD.org)
Date: Fri, 18 Jul 2014 08:52:00 GMT
Message-Id: <201407180852.s6I8q096014383@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org
 using -f
From: op@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271067 - soc2014/op/tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jul 2014 08:52:00 -0000

Author: op
Date: Fri Jul 18 08:51:59 2014
New Revision: 271067
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271067

Log:
  updated tools/svn-cherry-pick-from-git.csh added git log support
  
  Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
  
  

Modified:
  soc2014/op/tools/svn-cherry-pick-from-git.csh

Modified: soc2014/op/tools/svn-cherry-pick-from-git.csh
==============================================================================
--- soc2014/op/tools/svn-cherry-pick-from-git.csh	Fri Jul 18 08:49:09 2014	(r271066)
+++ soc2014/op/tools/svn-cherry-pick-from-git.csh	Fri Jul 18 08:51:59 2014	(r271067)
@@ -3,6 +3,7 @@
 set ver=$1
 set td=`mktemp -d`
 set opwd=${PWD}
+set GIT_DIR=${opwd}/.git
 set svndir="/usr/data/source/svn/op/freebsd-base"
 
 git format-patch -o ${td} ${ver}
@@ -10,10 +11,34 @@
 cd ${svndir}
 
 foreach i ( `ls ${td}` )
+	clear
 	set i=${td}/${i}
+	echo "PATCH: ${i}"
+	set files=`sed -n -e 's/ \(.*\).*|.* [0-9]*.*$/\1/gp' ${i}`
+	echo "FILES: ${files}"
+	echo "press ENTER to continue"
+	$<
+
 	less ${i}
 	patch -p1 < ${i}
-	svnlite commit
+	svnlite add ${files}
+	echo
+	echo "press ENTER to continue"
+	$<
+	set git_id=`sed -n -e '/From/s/From \([0-9a-f]*\) .*/\1/p' ${i}`
+	git --git-dir=${GIT_DIR} show --format="%s%n%n%b%ngit: https://github.com/opntr/opBSD/tree/op/gsoc2014/kpatch" -s ${git_id} > /tmp/svn-commit-message-${git_id}.txt
+	echo
+	cat /tmp/svn-commit-message-${git_id}.txt
+	echo "press ENTER to continue"
+	$<
+	svnlite commit -F /tmp/svn-commit-message-${git_id}.txt
 end
 
+svnlite up
+
+find . -type f -name "*.orig"
+echo "press ENTER to delete .orig files"
+$<
+find . -type f -name "*.orig" -delete
+
 cd ${PWD}