X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=3032c56d5f3f7a7178b41dd69e5a67e6a125905d;hp=2048e814b56b93a6e1f078301228fad9a006dbe4;hb=f9de6d94951a129a0a90c688b15807da2d56e77a;hpb=a9fc7e4bf085a8a666b3069e918d80e0bc289f76

diff --git a/dgit b/dgit
index 2048e814..3032c56d 100755
--- a/dgit
+++ b/dgit
@@ -32,6 +32,7 @@ use Data::Dumper;
 use LWP::UserAgent;
 use Dpkg::Control::Hash;
 use File::Path;
+use File::Spec;
 use File::Temp qw(tempdir);
 use File::Basename;
 use Dpkg::Version;
@@ -101,7 +102,11 @@ 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 = 'dpkg-source(?:-d)?|git|git-ff|check|none';
+our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
+                     | (?: git | git-ff ) (?: ,always )?
+                         | check (?: ,ignores )?
+                         | none
+                         )}x;
 
 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
 our $splitbraincache = 'dgit-intern/quilt-cache';
@@ -128,8 +133,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,
@@ -253,7 +258,7 @@ sub forceing ($) {
 }
 
 sub no_such_package () {
-    print STDERR f_ "%s: package %s does not exist in suite %s\n",
+    print STDERR f_ "%s: source package %s does not exist in suite %s\n",
 	$us, $package, $isuite;
     finish 4;
 }
@@ -790,6 +795,9 @@ sub git_get_config ($) {
 	@$l==1 or badcfg
 	    f_ "multiple values for %s (in %s git config)", $c, $src
 	    if @$l > 1;
+	$l->[0] =~ m/\n/ and badcfg f_
+ "value for config option %s (in %s git config) contains newline(s)!",
+            $c, $src;
 	return $l->[0];
     }
     return undef;
@@ -2190,17 +2198,89 @@ 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 dotdot_bpd_transfer_origs ($$$) {
+    my ($bpd_abs, $upstreamversion, $wanted) = @_;
+    # checks is_orig_file_of_vsn and if
+    # calls $wanted->{$leaf} and expects boolish
+
+    return if $buildproductsdir eq '..';
+
+    my $warned;
+    my $dotdot = $maindir;
+    $dotdot =~ s{/[^/]+$}{};
+    opendir DD, $dotdot or fail "opendir .. ($dotdot): $!";
+    while ($!=0, defined(my $leaf = readdir DD)) {
+	{
+	    local ($debuglevel) = $debuglevel-1;
+	    printdebug "DD_BPD $leaf ?\n";
+	}
+	next unless is_orig_file_of_vsn $leaf, $upstreamversion;
+	next unless $wanted->($leaf);
+	next if lstat "$bpd_abs/$leaf";
+
+	print STDERR f_
+ "%s: found orig(s) in .. missing from build-products-dir, transferring:\n",
+	    $us
+	    unless $warned++;
+	$! == &ENOENT or fail f_
+	    "check orig file %s in bpd %s: %s", $leaf, $bpd_abs, $!;
+	lstat "$dotdot/$leaf" or fail f_
+	    "check orig file %s in ..: %s", $leaf, $!;
+	if (-l _) {
+	    stat "$dotdot/$leaf" or fail f_
+		"check targe of orig symlink %s in ..: %s", $leaf, $!;
+	    my $ltarget = readlink "$dotdot/$leaf" or
+		die "readlink $dotdot/$leaf: $!";
+	    if ($ltarget !~ m{^/}) {
+		$ltarget = "$dotdot/$ltarget";
+	    }
+	    symlink $ltarget, "$bpd_abs/$leaf"
+		or die "$ltarget $bpd_abs $leaf: $!";
+	    print STDERR f_
+ "%s: cloned orig symlink from ..: %s\n",
+		$us, $leaf;
+	} elsif (link "$dotdot/$leaf", "$bpd_abs/$leaf") {
+	    print STDERR f_
+ "%s: hardlinked orig from ..: %s\n",
+		$us, $leaf;
+	} elsif ($! != EXDEV) {
+	    fail f_ "failed to make %s a hardlink to %s: %s",
+		"$bpd_abs/$leaf", "$dotdot/$leaf", $!;
+	} else {
+	    symlink "$bpd_abs/$leaf", "$dotdot/$leaf"
+		or die "$bpd_abs $dotdot $leaf $!";
+	    print STDERR f_
+ "%s: symmlinked orig from .. on other filesystem: %s\n",
+		$us, $leaf;
+	}
+    }
+    die "$dotdot; $!" if $!;
+    closedir DD;
+}
+
 sub generate_commits_from_dsc () {
     # See big comment in fetch_from_archive, below.
     # See also README.dsc-import.
     prep_ud();
     changedir $playground;
 
+    my $bpd_abs = bpd_abs();
+    my $upstreamv = upstreamversion $dsc->{version};
     my @dfi = dsc_files_info();
+
+    dotdot_bpd_transfer_origs $bpd_abs, $upstreamv,
+	sub { grep { $_->{Filename} eq $_[0] } @dfi };
+
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
 	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
-	my $upper_f = (bpd_abs()."/$f");
+	my $upper_f = "$bpd_abs/$f";
 
 	printdebug "considering reusing $f: ";
 
@@ -2224,18 +2304,18 @@ sub generate_commits_from_dsc () {
 
 	printdebug "considering saving $f: ";
 
-	if (link $f, $upper_f) {
+	if (rename_link_xf 1, $f, $upper_f) {
 	    printdebug "linked.\n";
-	} elsif ((printdebug "($!) "),
+	} elsif ((printdebug "($@) "),
 		 $! != EEXIST) {
-	    fail f_ "saving %s: %s", "$buildproductsdir/$f", $!;
+	    fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
 	} elsif (!$refetched) {
 	    printdebug "no need.\n";
-	} elsif (link $f, "$upper_f,fetch") {
+	} elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
 	    printdebug "linked (using ...,fetch).\n";
-	} elsif ((printdebug "($!) "),
+	} elsif ((printdebug "($@) "),
 		 $! != EEXIST) {
-	    fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $!;
+	    fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
 	} else {
 	    printdebug "cannot.\n";
 	}
@@ -2247,7 +2327,6 @@ sub generate_commits_from_dsc () {
     # from the debian/changelog, so we record the tree objects now and
     # make them into commits later.
     my @tartrees;
-    my $upstreamv = upstreamversion $dsc->{version};
     my $orig_f_base = srcfn $upstreamv, '';
 
     foreach my $fi (@dfi) {
@@ -3055,6 +3134,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
@@ -3751,10 +3831,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();
@@ -3817,12 +3900,25 @@ sub pull () {
 }
 
 sub check_not_dirty () {
-    foreach my $f (qw(local-options local-patch-header)) {
-	if (stat_exists "debian/source/$f") {
-	    fail f_ "git tree contains debian/source/%s", $f;
+    my @forbid = qw(local-options local-patch-header);
+    @forbid = map { "debian/source/$_" } @forbid;
+    foreach my $f (@forbid) {
+	if (stat_exists $f) {
+	    fail f_ "git tree contains %s", $f;
 	}
     }
 
+    my @cmd = (@git, qw(status -uall --ignored --porcelain));
+    push @cmd, qw(debian/source/format debian/source/options);
+    push @cmd, @forbid;
+
+    my $bad = cmdoutput @cmd;
+    if (length $bad) {
+	fail +(__
+ "you have uncommitted changes to critical files, cannot continue:\n").
+              $bad;
+    }
+
     return if $includedirty;
 
     git_check_unmodified();
@@ -5503,7 +5599,8 @@ sub quiltify ($$$$) {
 	    printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
 
 	    my @cmd= (@git, qw(diff-tree -r --name-only),
-		      $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
+		      $p->{Commit},$c->{Commit},
+		      qw(-- debian/patches .pc debian/source/format));
 	    my $patchstackchange = cmdoutput @cmd;
 	    if (length $patchstackchange) {
 		$patchstackchange =~ s/\n/,/g;
@@ -5759,17 +5856,20 @@ sub unpack_playtree_linkorigs ($$) {
     # calls $fn->($leafname);
 
     my $bpd_abs = bpd_abs();
+
+    dotdot_bpd_transfer_origs $bpd_abs, $upstreamversion, sub { 1 };
+
     opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
-    while ($!=0, defined(my $b = readdir QFD)) {
-	my $f = bpd_abs()."/".$b;
+    while ($!=0, defined(my $leaf = readdir QFD)) {
+	my $f = bpd_abs()."/".$leaf;
 	{
 	    local ($debuglevel) = $debuglevel-1;
-	    printdebug "QF linkorigs $b, $f ?\n";
+	    printdebug "QF linkorigs bpd $leaf, $f ?\n";
 	}
-	next unless is_orig_file_of_vsn $b, $upstreamversion;
-	printdebug "QF linkorigs $b, $f Y\n";
-	link_ltarget $f, $b or die "$b $!";
-        $fn->($b);
+	next unless is_orig_file_of_vsn $leaf, $upstreamversion;
+	printdebug "QF linkorigs $leaf, $f Y\n";
+	link_ltarget $f, $leaf or die "$leaf $!";
+        $fn->($leaf);
     }
     die "$buildproductsdir: $!" if $!;
     closedir QFD;
@@ -5804,7 +5904,9 @@ sub quilt_fixup_singlepatch ($$$) {
     changedir "..";
     runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
     rename srcfn("$upstreamversion", "/debian/patches"), 
-           "work/debian/patches";
+	"work/debian/patches"
+	or $!==ENOENT
+	or confess "install d/patches: $!";
 
     changedir "work";
     commit_quilty_patch();
@@ -5824,16 +5926,16 @@ Files:
 END
 
     my $dscaddfile=sub {
-        my ($b) = @_;
+        my ($leaf) = @_;
         
 	my $md = new Digest::MD5;
 
-	my $fh = new IO::File $b, '<' or die "$b $!";
+	my $fh = new IO::File $leaf, '<' or die "$leaf $!";
 	stat $fh or confess $!;
 	my $size = -s _;
 
 	$md->addfile($fh);
-	print $fakedsc " ".$md->hexdigest." $size $b\n" or confess $!;
+	print $fakedsc " ".$md->hexdigest." $size $leaf\n" or confess $!;
     };
 
     unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
@@ -6069,9 +6171,9 @@ END
     };
 
     my @dl;
-    foreach my $b (qw(01 02)) {
+    foreach my $bits (qw(01 02)) {
         foreach my $v (qw(O2H O2A H2A)) {
-            push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
+            push @dl, ($diffbits->{$v} & $bits) ? '##' : '==';
         }
     }
     printdebug "differences \@dl @dl.\n";
@@ -6180,34 +6282,70 @@ sub maybe_unapply_patches_again () {
 
 #----- other building -----
 
-our $clean_using_builder;
-# ^ tree is to be cleaned by dpkg-source's builtin idea that it should
-#   clean the tree before building (perhaps invoked indirectly by
-#   whatever we are using to run the build), rather than separately
-#   and explicitly by us.
+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 () {
+    # 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", '';
+    } 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 ?";
+    }
+}
 
 sub clean_tree () {
-    return if $clean_using_builder;
-    if ($cleanmode eq 'dpkg-source') {
+    # We always clean the tree ourselves, rather than leave it to the
+    # builder (dpkg-source, or soemthing which calls dpkg-source).
+    if ($cleanmode =~ m{^dpkg-source}) {
+	my @cmd = @dpkgbuildpackage;
+	push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
+	push @cmd, qw(-T clean);
 	maybe_apply_patches_dirtily();
-	runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
-    } elsif ($cleanmode eq 'dpkg-source-d') {
-	maybe_apply_patches_dirtily();
-	runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
-    } elsif ($cleanmode eq 'git') {
+	runcmd_ordryrun_local @cmd;
+	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 eq 'check') {
-	my $leftovers = cmdoutput @git, qw(clean -xdn);
-	if (length $leftovers) {
-	    print STDERR $leftovers, "\n" or confess $!;
-	    fail __
- "tree contains uncommitted files and --clean=check specified";
-	}
+    } elsif ($cleanmode =~ m{^check}) {
+	clean_tree_check();
     } elsif ($cleanmode eq 'none') {
     } else {
-	die "$cleanmode ?";
+	confess "$cleanmode ?";
     }
 }
 
@@ -6243,9 +6381,21 @@ sub build_prep_early () {
 sub build_prep ($) {
     my ($wantsrc) = @_;
     build_prep_early();
-    # clean the tree if we're trying to include dirty changes in the
-    # source package, or we are running the builder in $maindir
-    clean_tree() if $includedirty || ($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
+	# should do some kind of cleanliness check because (i) the
+	# user may have forgotten a `git add', and (ii) if the user
+	# said -wc we should still do the check.
+	clean_tree_check();
+    }
     build_maybe_quilt_fixup();
     if ($rmchanges) {
 	my $pat = changespat $version;
@@ -6516,9 +6666,7 @@ sub cmd_gbp_build {
 	build_source();
 	midbuild_checkchanges_vanilla $wantsrc;
     } else {
-	if (!$clean_using_builder) {
-	    push @cmd, '--git-cleaner=true';
-	}
+	push @cmd, '--git-cleaner=true';
     }
     maybe_unapply_patches_again();
     if ($wantsrc & WANTSRC_BUILDER) {
@@ -6566,6 +6714,24 @@ sub build_source {
         }
     } else {
         $leafdir = basename $maindir;
+
+	if ($buildproductsdir ne '..') {
+	    # Well, we are going to run dpkg-source -b which consumes
+	    # origs from .. and generates output there.  To make this
+	    # work when the bpd is not .. , we would have to (i) link
+	    # origs from bpd to .. , (ii) check for files that
+	    # dpkg-source -b would/might overwrite, and afterwards
+	    # (iii) move all the outputs back to the bpd (iv) except
+	    # for the origs which should be deleted from .. if they
+	    # weren't there beforehand.  And if there is an error and
+	    # we don't run to completion we would necessarily leave a
+	    # mess.  This is too much.  The real way to fix this
+	    # is for dpkg-source to have bpd support.
+	    confess unless $includedirty;
+	    fail __
+ "--include-dirty not supported with --build-products-dir, sorry";
+	}
+
         changedir '..';
     }
     runcmd_ordryrun_local @cmd, $leafdir;
@@ -6582,8 +6748,8 @@ sub build_source {
     my $mv = sub {
 	my ($why, $l) = @_;
         printdebug " renaming ($why) $l\n";
-        rename "$l", bpd_abs()."/$l"
-	    or fail f_ "put in place new built file (%s): %s", $l, $!;
+        rename_link_xf 0, "$l", bpd_abs()."/$l"
+	    or fail f_ "put in place new built file (%s): %s", $l, $@;
     };
     foreach my $l (split /\n/, getfield $dsc, 'Files') {
         $l =~ m/\S+$/ or next;
@@ -6812,7 +6978,7 @@ sub cmd_import_dsc {
 	    fail f_ <<END, $dsc_hash
 .dsc contains Dgit field referring to object %s
 Your git tree does not have that object.  Try `git fetch' from a
-plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
+plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.
 END
 	}
 	if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
@@ -6838,29 +7004,45 @@ END
     my @dfi = dsc_files_info();
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
+	# We transfer all the pieces of the dsc to the bpd, not just
+	# origs.  This is by analogy with dgit fetch, which wants to
+	# keep them somewhere to avoid downloading them again.
+	# We make symlinks, though.  If the user wants copies, then
+	# they can copy the parts of the dsc to the bpd using dcmd,
+	# or something.
 	my $here = "$buildproductsdir/$f";
 	if (lstat $here) {
-	    next if stat $here;
+	    if (stat $here) {
+		next;
+	    }
 	    fail f_ "lstat %s works but stat gives %s !", $here, $!;
 	}
 	fail f_ "stat %s: %s", $here, $! unless $! == ENOENT;
+	# $f does not exist in bpd, we need to transfer it
 	my $there = $dscfn;
-	if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
-	    $there = $';
-	} elsif ($dscfn =~ m#^/#) {
-	    $there = $dscfn;
+	$there =~ s{[^/]+$}{$f} or confess "$there ?";
+	# $there is file we want, relative to user's cwd, or abs
+	printdebug "not in bpd, $f, test $there ...\n";
+	stat $there or fail f_
+	    "import %s requires %s, but: %s", $dscfn, $there, $!;
+	if ($there =~ m#^(?:\./+)?\.\./+#) {
+	    # $there is relative to user's cwd
+	    my $there_from_parent = $';
+	    if ($buildproductsdir !~ m{^/}) {
+		# abs2rel, despite its name, can take two relative paths
+		$there = File::Spec->abs2rel($there,$buildproductsdir);
+		# now $there is relative to bpd, great
+	    } else {
+		$there = (dirname $maindir)."/$there_from_parent";
+		# now $there is absoute
+	    }
+	} elsif ($there =~ m#^/#) {
+	    # $there is absolute already
 	} else {
 	    fail f_
 		"cannot import %s which seems to be inside working tree!",
 		$dscfn;
 	}
-	$there =~ s#/+[^/]+$## or fail f_
-	    "import %s requires .../%s, but it does not exist",
-	    $dscfn, $f;
-	$there .= "/$f";
-	my $test = $there =~ m{^/} ? $there : "../$there";
-	stat $test or fail f_
-	    "import %s requires %s, but: %s", $dscfn, $test, $!;
 	symlink $there, $here or fail f_
 	    "symlink %s to %s: %s", $there, $here, $!;
 	progress f_ "made symlink %s -> %s", $here, $there;
@@ -7107,6 +7289,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;
@@ -7196,21 +7384,23 @@ sub parseopts () {
 		} elsif (s/^-wn$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'none';
-		} elsif (s/^-wg$//s) {
+		} elsif (s/^-wg(f?)(a?)$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'git';
-		} elsif (s/^-wgf$//s) {
-		    push @ropts, $&;
-		    $cleanmode = 'git-ff';
-		} elsif (s/^-wd$//s) {
+		    $cleanmode .= '-ff' if $1;
+		    $cleanmode .= ',always' if $2;
+		} elsif (s/^-wd(d?)([na]?)$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'dpkg-source';
-		} elsif (s/^-wdd$//s) {
-		    push @ropts, $&;
-		    $cleanmode = 'dpkg-source-d';
+		    $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';
+		} elsif (s/^-wci$//s) {
+		    push @ropts, $&;
+		    $cleanmode = 'check,ignores';
 		} elsif (s/^-c([^=]*)\=(.*)$//s) {
 		    push @git, '-c', $&;
 		    $gitcfgs{cmdline}{$1} = [ $2 ];
@@ -7318,11 +7508,14 @@ sub parseopts_late_defaults () {
 
     if (!defined $cleanmode) {
 	local $access_forpush;
-	$cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
+	$cleanmode = access_cfg('clean-mode-newer', 'RETURN-UNDEF');
+	$cleanmode = undef if $cleanmode && $cleanmode !~ m/^$cleanmode_re$/;
+
+	$cleanmode //= access_cfg('clean-mode', 'RETURN-UNDEF');
 	$cleanmode //= 'dpkg-source';
 
 	badcfg f_ "unknown clean-mode \`%s'", $cleanmode unless
-	    $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
+	    $cleanmode =~ m/$cleanmode_re/;
     }
 
     $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
@@ -7355,7 +7548,10 @@ $cmd =~ y/-/_/;
 my $pre_fn = ${*::}{"pre_$cmd"};
 $pre_fn->() if $pre_fn;
 
-record_maindir if $invoked_in_git_tree;
+if ($invoked_in_git_tree) {
+    changedir_git_toplevel();
+    record_maindir();
+}
 git_slurp_config();
 
 my $fn = ${*::}{"cmd_$cmd"};