X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=87ab8625018c0d5ad47e576d7b27a3c832152704;hb=dd2e4ce5738b2a41b4a18d7a8ff87a32692a2aac;hp=57e1e40d13d5c848b91a49ddd756d5bae27d1a78;hpb=c4f072101fba40bf5d387dbdd98d1459df82c67d;p=dgit.git

diff --git a/dgit b/dgit
index 57e1e40d..87ab8625 100755
--- a/dgit
+++ b/dgit
@@ -101,8 +101,8 @@ 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 )?
-                         | git | git-ff
+our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
+                     | (?: git | git-ff ) (?: ,always )?
                          | check (?: ,ignores )?
                          | none
                          )}x;
@@ -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();
@@ -6203,25 +6213,47 @@ sub maybe_unapply_patches_again () {
 
 #----- other building -----
 
-sub clean_tree_check_git ($$) {
-    my ($honour_ignores, $message) = @_;
+sub clean_tree_check_git ($$$) {
+    my ($honour_ignores, $message, $ignmessage) = @_;
     my @cmd = (@git, qw(clean -dn));
     push @cmd, qw(-x) unless $honour_ignores;
     my $leftovers = cmdoutput @cmd;
     if (length $leftovers) {
 	print STDERR $leftovers, "\n" or confess $!;
+	$message .= $ignmessage if $honour_ignores;
 	fail $message;
     }
 }
 
+sub clean_tree_check_git_wd ($) {
+    my ($message) = @_;
+    return if $cleanmode =~ m{no-check};
+    return if $patches_applied_dirtily; # yuk
+    clean_tree_check_git +($cleanmode !~ m{all-check}),
+	$message, "\n".__ <<END;
+If this is just missing .gitignore entries, use a different clean
+mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them
+or --clean=git (-wg/-wgf) to use \`git clean' instead.
+END
+}
+
 sub clean_tree_check () {
-    # Not yet fully implemented.
     # This function needs to not care about modified but tracked files.
     # That was done by check_not_dirty, and by now we may have run
     # the rules clean target which might modify tracked files (!)
     if ($cleanmode =~ m{^check}) {
 	clean_tree_check_git +($cleanmode =~ m{ignores}), __
- "tree contains uncommitted files and --clean=check specified";
+ "tree contains uncommitted files and --clean=check specified", '';
+    } 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}) {
+	clean_tree_check_git 1, __
+ "tree contains uncommited, untracked, unignored files\n".
+ "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.", '';
+    } elsif ($cleanmode eq 'none') {
+    } else {
+	confess "$cleanmode ?";
     }
 }
 
@@ -6234,15 +6266,17 @@ sub clean_tree () {
 	push @cmd, qw(-T clean);
 	maybe_apply_patches_dirtily();
 	runcmd_ordryrun_local @cmd;
-    } elsif ($cleanmode eq 'git') {
+	clean_tree_check_git_wd __
+ "tree contains uncommitted files (after running rules clean)";
+    } elsif ($cleanmode =~ m{^git(?!-)}) {
 	runcmd_ordryrun_local @git, qw(clean -xdf);
-    } elsif ($cleanmode eq 'git-ff') {
+    } elsif ($cleanmode =~ m{^git-ff}) {
 	runcmd_ordryrun_local @git, qw(clean -xdff);
     } elsif ($cleanmode =~ m{^check}) {
 	clean_tree_check();
     } elsif ($cleanmode eq 'none') {
     } else {
-	die "$cleanmode ?";
+	confess "$cleanmode ?";
     }
 }
 
@@ -6278,10 +6312,13 @@ sub build_prep_early () {
 sub build_prep ($) {
     my ($wantsrc) = @_;
     build_prep_early();
-    if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)) {
+    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
 	# package, or we are running the builder in $maindir.)
+	|| $cleanmode =~ m{always}) {
+	# Or because the user asked us to.
 	clean_tree();
     } else {
 	# We don't actually need to do anything in $maindir, but we
@@ -7167,6 +7204,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;
@@ -7256,16 +7299,16 @@ sub parseopts () {
 		} elsif (s/^-wn$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'none';
-		} elsif (s/^-wg$//s) {
+		} elsif (s/^-wg(f?)$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'git';
-		} elsif (s/^-wgf$//s) {
-		    push @ropts, $&;
-		    $cleanmode = 'git-ff';
-		} elsif (s/^-wd(d?)$//s) {
+		    $cleanmode .= '-ff' if $1;
+		} 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';