From owner-svn-src-user@FreeBSD.ORG  Wed Apr 28 08:58:23 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 58963106566C;
	Wed, 28 Apr 2010 08:58:23 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F0158FC1C;
	Wed, 28 Apr 2010 08:58:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3S8wNv6079938;
	Wed, 28 Apr 2010 08:58:23 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3S8wNoO079936;
	Wed, 28 Apr 2010 08:58:23 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201004280858.o3S8wNoO079936@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 28 Apr 2010 08:58:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207313 - user/des/fmerge
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Apr 2010 08:58:23 -0000

Author: des
Date: Wed Apr 28 08:58:22 2010
New Revision: 207313
URL: http://svn.freebsd.org/changeset/base/207313

Log:
  Add support for merging vendor / user / project branches into head:
  instead of setting $src_branch to head by default, leave it undefined
  and try to guess it from existing mergeinfo.

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Wed Apr 28 08:39:12 2010	(r207312)
+++ user/des/fmerge/fmerge.pl	Wed Apr 28 08:58:22 2010	(r207313)
@@ -35,7 +35,7 @@ our $already;
 our $debug;
 our $pretend;
 
-our $src_branch = "head";	# where we merge from
+our $src_branch;		# where we merge from
 our $src_path;			# path relative to source branch
 our $src_url;			# source URL
 our $tgt_branch;		# where we merge to
@@ -58,11 +58,15 @@ sub debug(@) {
 	if $debug;
 }
 
+sub error(@) {
+    info(@_);
+    exit(1);
+}
+
 sub svn_check($@) {
     my ($cond, @msg) = @_;
     if (!$cond) {
-	info(@msg);
-	exit(1);
+	error(@msg);
     }
 }
 
@@ -126,9 +130,19 @@ sub examine() {
     $fh = svn_catch('propget', 'svn:mergeinfo', $tgt_dir);
     while (<$fh>) {
 	chomp();
-	debug("'$_' =~ m\@^\Q/$src_branch\E((?:/[\\w.-]+)*):\@");
-	next unless m@^\Q/$src_branch\E((?:/[\w.-]+)*):@;
-	my $subdir = $1;
+	my $subdir;
+	if ($src_branch) {
+	    debug("have src_branch = $src_branch");
+	    debug("'$_' =~ m\@^\Q/$src_branch\E((?:/[\\w.-]+)*):\@");
+	    next unless m@^\Q/$src_branch\E((?:/[\w.-]+)*):@;
+	    $subdir = 1;
+	} else {
+	    debug("no src_branch");
+	    next unless m@^((?:/[\w.-]+)*):@;
+	    $src_branch = $1;
+	    $subdir = "";
+	}
+	debug("subdir = $subdir");
 	debug("'$svn_path' =~ m\@^((?:/[\\w.-]+)+)\Q$subdir\E\$\@");
 	next unless $svn_path =~ m@^((?:/[\w.-]+)+)\Q$subdir\E$@;
 	$svn_path = $subdir;
@@ -137,6 +151,10 @@ sub examine() {
     }
     close($fh);
 
+    if (!$src_branch) {
+	error("not enough information to deduce source or target");
+    }
+
     if (!$tgt_branch) {
 	# try to guess a stable / releng / release branch
 	debug("guessing target branch");