svn commit: r251105 - user/des/fmerge

[Dag-Erling Smørgrav]

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 {