X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=1090984aece5bd9bb2053af8e79f523ac2ccee5c;hp=654b3d1d4cc1817d378740cb2a4b3d7870b2221d;hb=37b5c1d305b5b7362e83ea4cbfdab4b9544031d3;hpb=79514d6b2708624a62c0e72c2ff0565682b310bf

diff --git a/dgit b/dgit
index 654b3d1d..1090984a 100755
--- a/dgit
+++ b/dgit
@@ -101,7 +101,7 @@ our %forceopts = map { $_=>0 }
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 our $suite_re = '[-+.0-9a-z]+';
-our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check )?
+our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
                          | git | git-ff
                          | check (?: ,ignores )?
                          | none
@@ -132,8 +132,8 @@ our (@mergechanges) = qw(mergechanges -f);
 our (@gbp_build) = ('');
 our (@gbp_pq) = ('gbp pq');
 our (@changesopts) = ('');
-our (@pbuilder) = ("sudo -E pbuilder");
-our (@cowbuilder) = ("sudo -E cowbuilder");
+our (@pbuilder) = ("sudo -E pbuilder","--no-source-only-changes");
+our (@cowbuilder) = ("sudo -E cowbuilder","--no-source-only-changes");
 
 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
 		     'curl' => \@curl,
@@ -2197,6 +2197,12 @@ sub check_for_vendor_patches () {
 			  __ "(nominal) distro being accessed");
 }
 
+sub check_bpd_exists () {
+    stat $buildproductsdir
+	or fail f_ "build-products-dir %s is not accessible: %s\n",
+	$buildproductsdir, $!;
+}
+
 sub generate_commits_from_dsc () {
     # See big comment in fetch_from_archive, below.
     # See also README.dsc-import.
@@ -3062,6 +3068,7 @@ END
 }
 
 sub fetch_from_archive () {
+    check_bpd_exists();
     ensure_setup_existing_tree();
 
     # Ensures that lrref() is what is actually in the archive, one way
@@ -3758,10 +3765,13 @@ sub clone ($) {
     }
     printdebug "clone main body\n";
 
-    canonicalise_suite();
-    my $hasgit = check_for_git();
     mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!;
     changedir $dstdir;
+    check_bpd_exists();
+
+    canonicalise_suite();
+    my $hasgit = check_for_git();
+
     runcmd @git, qw(init -q);
     record_maindir();
     setup_new_tree();
@@ -6218,11 +6228,11 @@ sub clean_tree_check_git_wd ($) {
     my ($message) = @_;
     return if $cleanmode =~ m{no-check};
     return if $patches_applied_dirtily; # yuk
-    clean_tree_check_git 1,
+    clean_tree_check_git +($cleanmode !~ m{all-check}),
 	                  (f_ <<END, $message);
 %s
 If this is just missing .gitignore entries, use a different clean
-mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them
+mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them
 or --clean=git (-wg/-wgf) to use \`git clean' instead.
 END
 }
@@ -6238,6 +6248,13 @@ sub clean_tree_check () {
     } elsif ($cleanmode =~ m{^dpkg-source}) {
 	clean_tree_check_git_wd __
  "tree contains uncommitted files (NB dgit didn't run rules clean)";
+    } elsif ($cleanmode =~ m{^git}) {
+	# If we were actually cleaning these files would be summarily
+	# deleted.  Since we're not, and not using the working tree
+	# anyway, we can just ignore them - nothing will use them.
+    } elsif ($cleanmode eq 'none') {
+    } else {
+	confess "$cleanmode ?";
     }
 }
 
@@ -6260,7 +6277,7 @@ sub clean_tree () {
 	clean_tree_check();
     } elsif ($cleanmode eq 'none') {
     } else {
-	die "$cleanmode ?";
+	confess "$cleanmode ?";
     }
 }
 
@@ -6296,6 +6313,7 @@ sub build_prep_early () {
 sub build_prep ($) {
     my ($wantsrc) = @_;
     build_prep_early();
+    check_bpd_exists();
     if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)) {
 	# Clean the tree because we're going to use the contents of
 	# $maindir.  (We trying to include dirty changes in the source
@@ -7185,6 +7203,12 @@ sub parseopts () {
 		     ($om = $opts_opt_map{$1})) {
 		push @ropts, $_;
 		push @$om, $2;
+	    } elsif (m/^--([-0-9a-z]+)\!:(.*)/s &&
+		     !$opts_opt_cmdonly{$1} &&
+		     ($om = $opts_opt_map{$1})) {
+		push @ropts, $_;
+		my $cmd = shift @$om;
+		@$om = ($cmd, grep { $_ ne $2 } @$om);
 	    } elsif (m/^--(gbp|dpm)$/s) {
 		push @ropts, "--quilt=$1";
 		$quilt_mode = $1;
@@ -7280,11 +7304,12 @@ sub parseopts () {
 		} elsif (s/^-wgf$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'git-ff';
-		} elsif (s/^-wd(d?)([n]?)$//s) {
+		} elsif (s/^-wd(d?)([na]?)$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'dpkg-source';
 		    $cleanmode .= '-d' if $1;
 		    $cleanmode .= ',no-check' if $2 eq 'n';
+		    $cleanmode .= ',all-check' if $2 eq 'a';
 		} elsif (s/^-wc$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'check';