X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=1e7c923eea6e8070b3f2254af6f8a85570d05aa4;hp=1a23d1a712c52ce528cf62dca26cb054a84e6960;hb=e70e2c7b6a8411ba86462bf96988732ef3a4ddd0;hpb=2d8ed57a73f0b8cc4ca31e60f85b24d4f6437075

diff --git a/dgit b/dgit
index 1a23d1a7..1e7c923e 100755
--- a/dgit
+++ b/dgit
@@ -69,6 +69,8 @@ our $rmchanges;
 our $overwrite_version; # undef: not specified; '': check changelog
 our $quilt_mode;
 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
+our $dodep14tag;
+our $dodep14tag_re = 'want|no|always';
 our $split_brain_save;
 our $we_are_responder;
 our $initiator_tempdir;
@@ -2365,6 +2367,8 @@ END
 	my $path = $ENV{PATH} or die;
 
 	foreach my $use_absurd (qw(0 1)) {
+	    runcmd @git, qw(checkout -q unpa);
+	    runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
 	    local $ENV{PATH} = $path;
 	    if ($use_absurd) {
 		chomp $@;
@@ -2381,11 +2385,12 @@ END
 		die "only absurd git-apply!\n" if !$use_absurd
 		    && forceing [qw(import-gitapply-absurd)];
 
-		local $ENV{PATH} = $path if $use_absurd;
+		local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
+		local $ENV{PATH} = $path                    if $use_absurd;
 
 		my @showcmd = (gbp_pq, qw(import));
 		my @realcmd = shell_cmd
-		    'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
+		    'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
 		debugcmd "+",@realcmd;
 		if (system @realcmd) {
 		    die +(shellquote @showcmd).
@@ -3269,7 +3274,7 @@ sub clone_finish ($) {
     runcmd qw(bash -ec), <<'END';
         set -o pipefail
         git ls-tree -r --name-only -z HEAD | \
-        xargs -0r touch -r . --
+        xargs -0r touch -h -r . --
 END
     printdone "ready for work in $dstdir";
 }
@@ -3674,7 +3679,21 @@ sub push_tagwants ($$$$) {
 	    TfSuffix => '-maintview',
             View => 'maint',
         };
-    }
+    } elsif ($dodep14tag eq 'no' ? 0
+	     : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
+	     : $dodep14tag eq 'always'
+	     ? (access_cfg_tagformats_can_splitbrain or fail <<END)
+--dep14tag-always (or equivalent in config) means server must support
+ both "new" and "maint" tag formats, but config says it doesn't.
+END
+	    : die "$dodep14tag ?") {
+	push @tagwants, {
+	    TagFn => \&debiantag_maintview,
+	    Objid => $dgithead,
+	    TfSuffix => '-dgit',
+	    View => 'dgit',
+        };
+    };
     foreach my $tw (@tagwants) {
 	$tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
 	$tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
@@ -4443,7 +4462,7 @@ END
 	local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
 	local $ENV{'VISUAL'} = $ENV{'EDITOR'};
 	local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
-	runcmd @dpkgsource, qw(--commit .), $patchname;
+	runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
     }
 }
 
@@ -4478,17 +4497,21 @@ sub quiltify_trees_differ ($$;$$$) {
 
 	if ($unrepres) {
 	    eval {
-	        die "deleted\n" unless $newmode =~ m/[^0]/;
-		die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
-		if ($oldmode =~ m/[^0]/) {
+		die "not a plain file\n"
+		    unless $newmode =~ m/^10\d{4}$/ ||
+		           $oldmode =~ m/^10\d{4}$/;
+		if ($oldmode =~ m/[^0]/ &&
+		    $newmode =~ m/[^0]/) {
 		    die "mode changed\n" if $oldmode ne $newmode;
 		} else {
-		    die "non-default mode\n" unless $newmode =~ m/^100644$/;
+		    die "non-default mode\n"
+			unless $newmode =~ m/^100644$/ ||
+			       $oldmode =~ m/^100644$/;
 		}
 	    };
 	    if ($@) {
 		local $/="\n"; chomp $@;
-		push @$unrepres, [ $f, $@ ];
+		push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
 	    }
 	}
 
@@ -6095,6 +6118,15 @@ sub parseopts () {
 	    } elsif (m/^--overwrite=(.+)$/s) {
 		push @ropts, $_;
 		$overwrite_version = $1;
+	    } elsif (m/^--dep14tag$/s) {
+		push @ropts, $_;
+		$dodep14tag= 'want';
+	    } elsif (m/^--no-dep14tag$/s) {
+		push @ropts, $_;
+		$dodep14tag= 'no';
+	    } elsif (m/^--always-dep14tag$/s) {
+		push @ropts, $_;
+		$dodep14tag= 'always';
 	    } elsif (m/^--delayed=(\d+)$/s) {
 		push @ropts, $_;
 		push @dput, $_;
@@ -6279,6 +6311,14 @@ if (!defined $quilt_mode) {
     $quilt_mode = $1;
 }
 
+if (!defined $dodep14tag) {
+    local $access_forpush;
+    $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
+    $dodep14tag =~ m/^($dodep14tag_re)$/ 
+	or badcfg "unknown dep14tag setting \`$dodep14tag'";
+    $dodep14tag = $1;
+}
+
 $need_split_build_invocation ||= quiltmode_splitbrain();
 
 if (!defined $cleanmode) {