X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=b06e0782aca0dbc1671f107b33e6568f6583018c;hp=83969717816bc5286d0566d2d7f1956e1085ad05;hb=9f670f31b4b278bae3da080742eeb4853fe95f89;hpb=d4bd3417c76450f248952606bff7e586600e34a8

diff --git a/dgit b/dgit
index 83969717..b06e0782 100755
--- a/dgit
+++ b/dgit
@@ -3108,6 +3108,33 @@ sub cmd_version {
     exit 0;
 }
 
+our (%valopts_long, %valopts_short);
+our @rvalopts;
+
+sub defvalopt ($$$$) {
+    my ($long,$short,$val_re,$how) = @_;
+    my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
+    $valopts_long{$long} = $oi;
+    $valopts_short{$short} = $oi;
+    # $how subref should:
+    #   do whatever assignemnt or thing it likes with $_[0]
+    #   if the option should not be passed on to remote, @rvalopts=()
+    # or $how can be a scalar ref, meaning simply assign the value
+}
+
+defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
+defvalopt '--distro',        '-d', '.+',      \$idistro;
+defvalopt '--existing-package','', '.*',      \$existing_package;
+defvalopt '--build-products-dir','','.*',     \$buildproductsdir;
+defvalopt '--clean',       '', $cleanmode_re, \$cleanmode;
+
+defvalopt '--initiator-tempdir','','.*', sub {
+    ($initiator_tempdir) = (@_);
+    $initiator_tempdir =~ m#^/# or
+	badusage "--initiator-tempdir must be used specify an".
+	" absolute, not relative, directory."
+};
+
 sub parseopts () {
     my $om;
 
@@ -3117,6 +3144,27 @@ sub parseopts () {
 	@ssh = ($ENV{'GIT_SSH'});
     }
 
+    my $oi;
+    my $val;
+    my $valopt = sub {
+	my ($what) = @_;
+	@rvalopts = ($_);
+	if (!defined $val) {
+	    badusage "$what needs a value" unless length @ARGV;
+	    $val = shift @ARGV;
+	    push @rvalopts, $val;
+	}
+	badusage "bad value \`$val' for $what" unless
+	    $val =~ m/^$oi->{Re}$(?!\n)/s;
+	my $how = $oi->{How};
+	if (ref($how) eq 'SCALAR') {
+	    $$how = $val;
+	} else {
+	    $how->($val);
+	}
+	push @ropts, @rvalopts;
+    };
+
     while (@ARGV) {
 	last unless $ARGV[0] =~ m/^-/;
 	$_ = shift @ARGV;
@@ -3138,9 +3186,6 @@ sub parseopts () {
 	    } elsif (m/^--new$/) {
 		push @ropts, $_;
 		$new_package=1;
-	    } elsif (m/^--since-version=([^_]+|_)$/) {
-		push @ropts, $_;
-		$changes_since_version = $1;
 	    } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
 		     ($om = $opts_opt_map{$1}) &&
 		     length $om->[0]) {
@@ -3151,25 +3196,6 @@ sub parseopts () {
 		     ($om = $opts_opt_map{$1})) {
 		push @ropts, $_;
 		push @$om, $2;
-	    } elsif (m/^--existing-package=(.*)/s) {
-		push @ropts, $_;
-		$existing_package = $1;
-	    } elsif (m/^--initiator-tempdir=(.*)/s) {
-		$initiator_tempdir = $1;
-		$initiator_tempdir =~ m#^/# or
-		    badusage "--initiator-tempdir must be used specify an".
-		        " absolute, not relative, directory."
-	    } elsif (m/^--distro=(.*)/s) {
-		push @ropts, $_;
-		$idistro = $1;
-	    } elsif (m/^--build-products-dir=(.*)/s) {
-		push @ropts, $_;
-		$buildproductsdir = $1;
-	    } elsif (m/^--clean=($cleanmode_re)$/os) {
-		push @ropts, $_;
-		$cleanmode = $1;
-	    } elsif (m/^--clean=(.*)$/s) {
-		badusage "unknown cleaning mode \`$1'";
 	    } elsif (m/^--quilt=($quilt_modes_re)$/s) {
 		push @ropts, $_;
 		$quilt_mode = $1;
@@ -3187,6 +3213,9 @@ sub parseopts () {
 	    } elsif (m/^--deliberately-($deliberately_re)$/s) {
 		push @ropts, $_;
 		push @deliberatelies, $&;
+	    } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
+		$val = $2 ? $' : undef; #';
+		$valopt->($oi->{Long});
 	    } else {
 		badusage "unknown long option \`$_'";
 	    }
@@ -3207,9 +3236,6 @@ sub parseopts () {
 		} elsif (s/^-N/-/) {
 		    push @ropts, $&;
 		    $new_package=1;
-		} elsif (s/^-v([^_]+|_)$//s) {
-		    push @ropts, $&;
-		    $changes_since_version = $1;
 		} elsif (m/^-m/) {
 		    push @ropts, $&;
 		    push @changesopts, $_;
@@ -3217,9 +3243,6 @@ sub parseopts () {
 		} elsif (s/^-c(.*=.*)//s) {
 		    push @ropts, $&;
 		    push @git, '-c', $1;
-		} elsif (s/^-d(.+)//s) {
-		    push @ropts, $&;
-		    $idistro = $1;
 		} elsif (s/^-C(.+)//s) {
 		    push @ropts, $&;
 		    $changesfile = $1;
@@ -3228,7 +3251,7 @@ sub parseopts () {
 		    }
 		} elsif (s/^-k(.+)//s) {
 		    $keyid=$1;
-		} elsif (m/^-[vdCk]$/) {
+		} elsif (m/^-[dCk]$/) {
 		    badusage
  "option \`$_' requires an argument (and no space before the argument)";
 		} elsif (s/^-wn$//s) {
@@ -3249,6 +3272,11 @@ sub parseopts () {
 		} elsif (s/^-wc$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'check';
+		} elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
+		    $val = $'; #';
+		    $val = undef unless length $val;
+		    $valopt->($oi->{Short});
+		    $_ = '';
 		} else {
 		    badusage "unknown short option \`$_'";
 		}