svn commit: r195728 - user/des/fmerge

[Dag-Erling Smorgrav]

Author: des
Date: Thu Jul 16 21:54:41 2009
New Revision: 195728
URL: http://svn.freebsd.org/changeset/base/195728

Log:
  Fix arg parsing

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Thu Jul 16 21:13:04 2009	(r195727)
+++ user/des/fmerge/fmerge.pl	Thu Jul 16 21:54:41 2009	(r195728)
@@ -163,13 +163,13 @@ MAIN:{
     if ($ARGV[0] eq 'all') {
 	shift;
     } else {
-	while (@ARGV && $ARGV[0] =~ m/^r?\d+(,r?\d+)*$/) {
+	while (@ARGV && $ARGV[0] =~ m/^[cr]?\d+([-:][cr]?\d+)?(,[cr]?\d+([-:][cr]?\d+)?)*$/) {
 	    foreach my $rev (split(',', $ARGV[0])) {
 		if ($rev =~ m/^[cr]?(\d+)$/) {
 		    push(@revs, [ $1 - 1, $1 ]);
 		} elsif ($rev =~ m/^[cr]?-(\d+)$/) {
 		    push(@revs, [ $1, $1 - 1 ]);
-		} elsif ($rev =~ m/^r?(\d+)[-:](\d+)$/) {
+		} elsif ($rev =~ m/^[cr]?(\d+)[-:][cr]?(\d+)$/) {
 		    push(@revs, [ $1, $2 ]);
 		} else {
 		    usage();