From owner-svn-src-user@FreeBSD.ORG  Wed Jun 17 11:12:49 2009
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 239EB106564A;
	Wed, 17 Jun 2009 11:12:49 +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 127F98FC15;
	Wed, 17 Jun 2009 11:12:49 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5HBClYs073310;
	Wed, 17 Jun 2009 11:12:47 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HBClIF073308;
	Wed, 17 Jun 2009 11:12:47 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906171112.n5HBClIF073308@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 17 Jun 2009 11:12:47 +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: r194346 - 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, 17 Jun 2009 11:12:49 -0000

Author: des
Date: Wed Jun 17 11:12:47 2009
New Revision: 194346
URL: http://svn.freebsd.org/changeset/base/194346

Log:
  cleanup

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Wed Jun 17 10:57:47 2009	(r194345)
+++ user/des/fmerge/fmerge.pl	Wed Jun 17 11:12:47 2009	(r194346)
@@ -55,28 +55,29 @@ sub debug(@) {
 
 sub svn_check($;$) {
     my ($cond, $msg) = @_;
-    die(($msg || "something is rotten in the state of subversion") . "\n")
+    die(($msg || 'something is rotten in the state of subversion') . "\n")
 	unless $cond;
 }
 
 sub svn_do(@) {
     my @argv = @_;
-    info("svn", @argv);
-    system("svn", @argv)
+    info('svn', @argv);
+    system('svn', @argv)
 	unless $pretend;
 }
 
 sub svn_merge(@) {
-    unshift(@_, "--record-only")
+    unshift(@_, '--record-only')
 	if $already;
-    unshift(@_, "merge");
+    unshift(@_, 'merge');
     goto &svn_do;
 }
 
 sub svn_catch(@) {
     my (@argv) = @_;
 
-    open(my $fh, "-|", "svn", @argv)
+    debug('svn', @argv);
+    open(my $fh, '-|', 'svn', @argv)
 	or die("fmerge: could not run svn\n");
     return $fh;
 }
@@ -87,12 +88,12 @@ sub examine() {
 	chomp();
 	my ($key, $value) = split(/:\s+/, $_, 2);
 	next unless $key && $value;
-	if ($key eq "Path") {
+	if ($key eq 'Path') {
 	    debug("'$value' eq '$target'?");
 	    svn_check($value eq $target);
-	} elsif ($key eq "URL") {
+	} elsif ($key eq 'URL') {
 	    $svn_url = $value;
-	} elsif ($key eq "Repository Root") {
+	} elsif ($key eq 'Repository Root') {
 	    $svn_root = $value;
 	}
     }
@@ -101,7 +102,7 @@ sub examine() {
     svn_check($svn_url =~ m@^\Q$svn_root\E(/.*)$@);
     $svn_path = $1;
 
-    $fh = svn_catch("propget", "svn:mergeinfo", $target);
+    $fh = svn_catch('propget', 'svn:mergeinfo', $target);
     while (<$fh>) {
 	chomp();
 	debug("'$_' =~ m\@\Q/$branch\E((?:/[\\w.-]+)*):\@");