X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=f068df6a50f267680368d2ffa5f72864c9644565;hp=21cbd56f67d26cc1cd8ab11052461f4c37d6ef5c;hb=f83789bb6d8cda46a87a61ca846843376261ad35;hpb=348b995ead9fbcab890da5d222af36402f33d68c

diff --git a/dgit b/dgit
index 21cbd56f..f068df6a 100755
--- a/dgit
+++ b/dgit
@@ -57,7 +57,7 @@ our $rmonerror = 1;
 our @deliberatelies;
 our %previously;
 our $existing_package = 'dpkg';
-our $cleanmode = 'dpkg-source';
+our $cleanmode;
 our $changes_since_version;
 our $quilt_mode;
 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck';
@@ -67,6 +67,7 @@ our $initiator_tempdir;
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 our $suite_re = '[-+.0-9a-z]+';
+our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
 
 our (@git) = qw(git);
 our (@dget) = qw(dget);
@@ -2973,9 +2974,15 @@ sub cmd_build {
 sub cmd_gbp_build {
     my @dbp = @dpkgbuildpackage;
     massage_dbp_args \@dbp, \@ARGV;
-    my @cmd =
-	(qw(git-buildpackage -us -uc --git-no-sign-tags),
-	 "--git-builder=@dbp");
+
+    my @cmd;
+    if (length executable_on_path('git-buildpackage')) {
+	@cmd = qw(git-buildpackage);
+    } else {
+	@cmd = qw(gbp buildpackage);
+    }
+    push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
+
     if ($cleanmode eq 'dpkg-source') {
 	$suppress_clean = 1;
     } else {
@@ -3101,6 +3108,23 @@ sub cmd_version {
     exit 0;
 }
 
+our (%valopts_long, %valopts_short);
+our @rvalopts;
+
+sub defvalopt ($$$&) {
+    my ($long,$short,$val_re,$fn) = @_;
+    my $oi = { Long => $long, Short => $short, Re => $val_re, Fn => $fn };
+    $valopts_long{$long} = $oi;
+    $valopts_short{$short} = $oi;
+    # $fn subref should:
+    #   do whatever assignemnt or thing it likes with $_[0]
+    #   if the option should not be passed on to remote, @rvalopts=()
+}
+
+defvalopt '--since-version', '-v', '[^_]+|_', sub {
+    ($changes_since_version) = @_;
+};
+
 sub parseopts () {
     my $om;
 
@@ -3110,6 +3134,22 @@ 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;
+	$oi->{Fn}($val);
+	push @ropts, @rvalopts;
+    };
+
     while (@ARGV) {
 	last unless $ARGV[0] =~ m/^-/;
 	$_ = shift @ARGV;
@@ -3131,9 +3171,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]) {
@@ -3158,7 +3195,7 @@ sub parseopts () {
 	    } elsif (m/^--build-products-dir=(.*)/s) {
 		push @ropts, $_;
 		$buildproductsdir = $1;
-	    } elsif (m/^--clean=(dpkg-source(?:-d)?|git|git-ff|check|none)$/s) {
+	    } elsif (m/^--clean=($cleanmode_re)$/os) {
 		push @ropts, $_;
 		$cleanmode = $1;
 	    } elsif (m/^--clean=(.*)$/s) {
@@ -3180,6 +3217,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 \`$_'";
 	    }
@@ -3200,9 +3240,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, $_;
@@ -3221,7 +3258,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) {
@@ -3242,6 +3279,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 \`$_'";
 		}
@@ -3305,6 +3347,15 @@ if (!defined $quilt_mode) {
     $quilt_mode = $1;
 }
 
+if (!defined $cleanmode) {
+    local $access_forpush;
+    $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
+    $cleanmode //= 'dpkg-source';
+
+    badcfg "unknown clean-mode \`$cleanmode'" unless
+	$cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
+}
+
 my $fn = ${*::}{"cmd_$cmd"};
 $fn or badusage "unknown operation $cmd";
 $fn->();