From owner-svn-src-user@FreeBSD.ORG  Wed May 29 17:04:44 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5B7A54D2;
 Wed, 29 May 2013 17:04:44 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4D9DDA06;
 Wed, 29 May 2013 17:04:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4TH4iid066290;
 Wed, 29 May 2013 17:04:44 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4TH4iS4066289;
 Wed, 29 May 2013 17:04:44 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201305291704.r4TH4iS4066289@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 29 May 2013 17:04:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r251105 - user/des/fmerge
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 29 May 2013 17:04:44 -0000

Author: des
Date: Wed May 29 17:04:43 2013
New Revision: 251105
URL: http://svnweb.freebsd.org/changeset/base/251105

Log:
  Add a "which" command which shows eligible revisions.

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Wed May 29 16:55:33 2013	(r251104)
+++ user/des/fmerge/fmerge.pl	Wed May 29 17:04:43 2013	(r251105)
@@ -34,6 +34,7 @@ use warnings;
 our $already;
 our $debug;
 our $pretend;
+our $which;
 
 our $src_branch;		# where we merge from
 our $src_path;			# path relative to source branch
@@ -88,7 +89,9 @@ sub svn_do(@) {
 sub svn_merge(@) {
     unshift(@_, '--record-only')
 	if $already;
-    unshift(@_, 'merge');
+    unshift(@_, '--show-revs=eligible')
+	if $which;
+    unshift(@_, $which ? 'mergeinfo' : 'merge');
     goto &svn_do;
 }
 
@@ -255,6 +258,9 @@ MAIN:{
 	} elsif ($ARGV[0] eq 'pretend') {
 	    shift;
 	    $pretend++;
+	} elsif ($ARGV[0] eq 'which') {
+	    shift;
+	    $which++;
 	} else {
 	    last;
 	}
@@ -262,6 +268,9 @@ MAIN:{
     if (@ARGV < 1) {
 	usage();
     }
+    if ($which && ($already || $pretend)) {
+	error("'which' is not compatible with 'already' and 'pretend'");
+    }
     if ($ARGV[0] eq 'all') {
 	shift;
     } else {