From owner-svn-src-user@FreeBSD.ORG  Wed Apr 28 09:01: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 339C4106566C;
	Wed, 28 Apr 2010 09:01: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 2366E8FC14;
	Wed, 28 Apr 2010 09:01: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 o3S91Nb6080654;
	Wed, 28 Apr 2010 09:01:23 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3S91Nnj080652;
	Wed, 28 Apr 2010 09:01:23 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201004280901.o3S91Nnj080652@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 28 Apr 2010 09:01: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: r207314 - 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 09:01:23 -0000

Author: des
Date: Wed Apr 28 09:01:22 2010
New Revision: 207314
URL: http://svn.freebsd.org/changeset/base/207314

Log:
  get rid of svn_check()

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Wed Apr 28 08:58:22 2010	(r207313)
+++ user/des/fmerge/fmerge.pl	Wed Apr 28 09:01:22 2010	(r207314)
@@ -63,13 +63,6 @@ sub error(@) {
     exit(1);
 }
 
-sub svn_check($@) {
-    my ($cond, @msg) = @_;
-    if (!$cond) {
-	error(@msg);
-    }
-}
-
 sub svn_do(@) {
     my @argv = @_;
     unshift(@argv, '--dry-run')
@@ -114,7 +107,9 @@ sub examine() {
 	my ($key, $value) = split(/:\s+/, $_, 2);
 	next unless $key && $value;
 	if ($key eq 'Path') {
-	    svn_check($value eq $tgt_dir, "path mismatch: $value != $tgt_dir");
+	    if (!$value eq $tgt_dir) {
+		error("path mismatch: $value != $tgt_dir");
+	    }
 	} elsif ($key eq 'URL') {
 	    $tgt_url = $value;
 	} elsif ($key eq 'Repository Root') {
@@ -123,7 +118,8 @@ sub examine() {
     }
     close($fh);
 
-    svn_check($tgt_url =~ m@^\Q$svn_root\E(/.*)$@, "invalid svn URL: $tgt_url");
+    $tgt_url =~ m@^\Q$svn_root\E(/.*)$@
+	or error("invalid svn URL: $tgt_url");
     $svn_path = $1;
 
     debug("guessing merge source / target directory");
@@ -150,7 +146,6 @@ sub examine() {
 	last;
     }
     close($fh);
-
     if (!$src_branch) {
 	error("not enough information to deduce source or target");
     }
@@ -162,7 +157,9 @@ sub examine() {
 	$svn_path =~ s@^/(head|\w+/\d+(?:\.\d+)*)/?@@;
 	$tgt_branch = $1;
     }
-    svn_check($tgt_branch, "unable to figure out source branch");
+    if (!$tgt_branch) {
+	error("unable to figure out source branch");
+    }
     debug("tgt_branch = '$tgt_branch'");
     debug("svn_path = '$svn_path'");
 }