X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=3afaf193a4127e320ce611162b9f5f896086350f;hp=c813a11f4f5fa842278e4e96169e7f95dd597080;hb=e93761ae8a48c2492c3eec035c82bc3dca5e634e;hpb=4d87a7d43579ecd11d31116e6e9dab4e6adb1af3

diff --git a/dgit b/dgit
index c813a11f..3afaf193 100755
--- a/dgit
+++ b/dgit
@@ -63,9 +63,10 @@ our @ropts;
 our $sign = 1;
 our $dryrun_level = 0;
 our $changesfile;
-our $buildproductsdir = '..';
+our $buildproductsdir;
+our $bpd_glob;
 our $new_package = 0;
-our $ignoredirty = 0;
+our $includedirty = 0;
 our $rmonerror = 1;
 our @deliberatelies;
 our %previously;
@@ -165,7 +166,7 @@ our $keyid;
 autoflush STDOUT 1;
 
 our $supplementary_message = '';
-our $need_split_build_invocation = 0;
+our $need_split_build_invocation = 1;
 our $split_brain = 0;
 
 END {
@@ -189,11 +190,6 @@ sub debiantag ($$) {
     return $tagformatfn->($v, $distro);
 }
 
-sub debiantag_maintview ($$) { 
-    my ($v,$distro) = @_;
-    return "$distro/".dep14_version_mangle $v;
-}
-
 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
 
 sub lbranch () { return "$branchprefix/$csuite"; }
@@ -293,6 +289,12 @@ sub dgit_privdir () {
     our $dgit_privdir_made //= ensure_a_playground 'dgit';
 }
 
+sub bpd_abs () {
+    my $r = $buildproductsdir;
+    $r = "$maindir/$r" unless $r =~ m{^/};
+    return $r;
+}
+
 sub branch_gdr_info ($$) {
     my ($symref, $head) = @_;
     my ($status, $msg, $current, $ffq_prev, $gdrlast) =
@@ -1242,7 +1244,14 @@ END
     }
     my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
     @releasefiles = @inreleasefiles if @inreleasefiles;
-    die "apt updated wrong number of Release files (@releasefiles), erk"
+    if (!@releasefiles) {
+	fail <<END;
+apt seemed to not to update dgit's cached Release files for $isuite.
+(Perhaps $cache
+ is on a filesystem mounted `noatime'; if so, please use `relatime'.)
+END
+    }
+    die "apt updated too many Release files (@releasefiles), erk"
 	unless @releasefiles == 1;
 
     ($aptget_releasefile) = @releasefiles;
@@ -2110,7 +2119,7 @@ sub generate_commits_from_dsc () {
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
 	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
-	my $upper_f = "$maindir/../$f";
+	my $upper_f = (bpd_abs()."/$f");
 
 	printdebug "considering reusing $f: ";
 
@@ -2118,12 +2127,12 @@ sub generate_commits_from_dsc () {
 	    printdebug "linked (using ...,fetch).\n";
 	} elsif ((printdebug "($!) "),
 		 $! != ENOENT) {
-	    fail "accessing ../$f,fetch: $!";
+	    fail "accessing $buildproductsdir/$f,fetch: $!";
 	} elsif (link_ltarget $upper_f, $f) {
 	    printdebug "linked.\n";
 	} elsif ((printdebug "($!) "),
 		 $! != ENOENT) {
-	    fail "accessing ../$f: $!";
+	    fail "accessing $buildproductsdir/$f: $!";
 	} else {
 	    printdebug "absent.\n";
 	}
@@ -2138,14 +2147,14 @@ sub generate_commits_from_dsc () {
 	    printdebug "linked.\n";
 	} elsif ((printdebug "($!) "),
 		 $! != EEXIST) {
-	    fail "saving ../$f: $!";
+	    fail "saving $buildproductsdir/$f: $!";
 	} elsif (!$refetched) {
 	    printdebug "no need.\n";
 	} elsif (link $f, "$upper_f,fetch") {
 	    printdebug "linked (using ...,fetch).\n";
 	} elsif ((printdebug "($!) "),
 		 $! != EEXIST) {
-	    fail "saving ../$f,fetch: $!";
+	    fail "saving $buildproductsdir/$f,fetch: $!";
 	} else {
 	    printdebug "cannot.\n";
 	}
@@ -2289,22 +2298,14 @@ sub generate_commits_from_dsc () {
     }
 
     my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
-    debugcmd "|",@clogcmd;
-    open CLOGS, "-|", @clogcmd or die $!;
-
     my $clogp;
     my $r1clogp;
 
     printdebug "import clog search...\n";
+    parsechangelog_loop \@clogcmd, "package changelog", sub {
+	my ($thisstanza, $desc) = @_;
+	no warnings qw(exiting);
 
-    for (;;) {
-	my $stanzatext = do { local $/=""; <CLOGS>; };
-	printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
-	last if !defined $stanzatext;
-
-	my $desc = "package changelog, entry no.$.";
-	open my $stanzafh, "<", \$stanzatext or die;
-	my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
 	$clogp //= $thisstanza;
 
 	printdebug "import clog $thisstanza->{version} $desc...\n";
@@ -2339,9 +2340,7 @@ sub generate_commits_from_dsc () {
 	$r1clogp = $thisstanza;
 
 	printdebug "import clog $r1clogp->{version} becomes r1\n";
-    }
-    die $! if CLOGS->error;
-    close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
+    };
 
     $clogp or fail "package changelog has no entries!";
 
@@ -2582,7 +2581,7 @@ sub ensure_we_have_orig () {
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
 	next unless is_orig_file_in_dsc($f, \@dfi);
-	complete_file_from_dsc('..', $fi)
+	complete_file_from_dsc($buildproductsdir, $fi)
 	    or next;
     }
 }
@@ -3738,7 +3737,7 @@ sub check_not_dirty () {
 	}
     }
 
-    return if $ignoredirty;
+    return if $includedirty;
 
     git_check_unmodified();
 }
@@ -4000,7 +3999,7 @@ sub splitbrain_pseudomerge ($$$$) {
         $@ =~ s/^\n//; chomp $@;
 	print STDERR <<END;
 $@
-| Not fast forward; maybe --overwrite is needed, see dgit(1)
+| Not fast forward; maybe --overwrite is needed ?  Please see dgit(1).
 END
 	finish -1;
     }
@@ -4759,6 +4758,8 @@ sub cmd_push {
 
 sub cmd_push_source {
     prep_push();
+    fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
+      "sense with push-source!" if $includedirty;
     if ($changesfile) {
         my $changes = parsecontrol("$buildproductsdir/$changesfile",
                                    "source changes file");
@@ -5640,7 +5641,7 @@ END
         @git, qw(pull --ff-only -q), "$playground/work", qw(master);
 }
 
-sub quilt_fixup_mkwork ($) {
+sub unpack_playtree_mkwork ($) {
     my ($headref) = @_;
 
     mkdir "work" or die $!;
@@ -5649,12 +5650,14 @@ sub quilt_fixup_mkwork ($) {
     runcmd @git, qw(reset -q --hard), $headref;
 }
 
-sub quilt_fixup_linkorigs ($$) {
+sub unpack_playtree_linkorigs ($$) {
     my ($upstreamversion, $fn) = @_;
     # calls $fn->($leafname);
 
-    foreach my $f (<$maindir/../*>) { #/){
-	my $b=$f; $b =~ s{.*/}{};
+    my $bpd_abs = bpd_abs();
+    opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
+    while ($!=0, defined(my $b = readdir QFD)) {
+	my $f = bpd_abs()."/".$b;
 	{
 	    local ($debuglevel) = $debuglevel-1;
 	    printdebug "QF linkorigs $b, $f ?\n";
@@ -5664,6 +5667,8 @@ sub quilt_fixup_linkorigs ($$) {
 	link_ltarget $f, $b or die "$b $!";
         $fn->($b);
     }
+    die "$buildproductsdir: $!" if $!;
+    closedir QFD;
 }
 
 sub quilt_fixup_delete_pc () {
@@ -5685,8 +5690,8 @@ sub quilt_fixup_singlepatch ($$$) {
     # get it to generate debian/patches/debian-changes, it is
     # necessary to build the source package.
 
-    quilt_fixup_linkorigs($upstreamversion, sub { });
-    quilt_fixup_mkwork($headref);
+    unpack_playtree_linkorigs($upstreamversion, sub { });
+    unpack_playtree_mkwork($headref);
 
     rmtree("debian/patches");
 
@@ -5726,7 +5731,7 @@ END
 	print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
     };
 
-    quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
+    unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
 
     my @files=qw(debian/source/format debian/rules
                  debian/control debian/changelog);
@@ -5794,7 +5799,7 @@ sub quilt_check_splitbrain_cache ($$) {
 	next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
 	    
 	my $cachehit = $1;
-	quilt_fixup_mkwork($headref);
+	unpack_playtree_mkwork($headref);
 	my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
 	if ($cachehit ne $headref) {
 	    progress "dgit view: found cached ($saved)";
@@ -5925,13 +5930,13 @@ sub quilt_fixup_multipatch ($$$) {
 failed to apply your git tree's patch stack (from debian/patches/) to
  the corresponding upstream tarball(s).  Your source tree and .orig
  are probably too inconsistent.  dgit can only fix up certain kinds of
- anomaly (depending on the quilt mode).  See --quilt= in dgit(1).
+ anomaly (depending on the quilt mode).  Please see --quilt= in dgit(1).
 END
     }
 
     changedir '..';
 
-    quilt_fixup_mkwork($headref);
+    unpack_playtree_mkwork($headref);
 
     my $mustdeletepc=0;
     if (stat_exists ".pc") {
@@ -6103,6 +6108,10 @@ sub cmd_clean () {
     maybe_unapply_patches_again();
 }
 
+# return values from massage_dbp_args are one or both of these flags
+sub WANTSRC_SOURCE  () { 01; } # caller should build source (separately)
+sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
+
 sub build_or_push_prep_early () {
     our $build_or_push_prep_early_done //= 0;
     return if $build_or_push_prep_early_done++;
@@ -6191,16 +6200,11 @@ sub massage_dbp_args ($;$) {
     #    unless we're not doing a split build and want dpkg-source
     #    as cleanmode, in which case we can do nothing
     #
-    # return values:
-    #    0 - source will NOT need to be built separately by caller
-    #   +1 - source will need to be built separately by caller
-    #   +2 - source will need to be built separately by caller AND
-    #        dpkg-buildpackage should not in fact be run at all!
     debugcmd '#massaging#', @$cmd if $debuglevel>1;
 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
     if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
 	$clean_using_builder = 1;
-	return 0;
+	return WANTSRC_BUILDER;
     }
     # -nc has the side effect of specifying -b if nothing else specified
     # and some combinations of -S, -b, et al, are errors, rather than
@@ -6216,12 +6220,12 @@ sub massage_dbp_args ($;$) {
     }
     push @$cmd, '-nc';
 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
-    my $r = 0;
+    my $r = WANTSRC_BUILDER;
     if ($need_split_build_invocation) {
 	printdebug "massage split $dmode.\n";
-	$r = $dmode =~ m/[S]/     ? +2 :
-	     $dmode =~ y/gGF/ABb/ ? +1 :
-	     $dmode =~ m/[ABb]/   ?  0 :
+	$r = $dmode =~ m/[S]/     ?  WANTSRC_SOURCE :
+	     $dmode =~ y/gGF/ABb/ ?  WANTSRC_SOURCE | WANTSRC_BUILDER :
+	     $dmode =~ m/[ABb]/   ?                   WANTSRC_BUILDER :
 	     die "$dmode ?";
     }
     printdebug "massage done $r $dmode.\n";
@@ -6230,21 +6234,22 @@ sub massage_dbp_args ($;$) {
     return $r;
 }
 
-sub in_parent (&) {
+sub in_bpd (&) {
     my ($fn) = @_;
     my $wasdir = must_getcwd();
-    changedir "..";
+    changedir $buildproductsdir;
     $fn->();
     changedir $wasdir;
 }    
 
-sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
+# this sub must run with CWD=$buildproductsdir (eg in in_bpd)
+sub postbuild_mergechanges ($) {
     my ($msg_if_onlyone) = @_;
     # If there is only one .changes file, fail with $msg_if_onlyone,
     # or if that is undef, be a no-op.
     # Returns the changes file to report to the user.
     my $pat = changespat $version;
-    my @changesfiles = glob $pat;
+    my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
     @changesfiles = sort {
 	($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
 	    or $a cmp $b
@@ -6280,8 +6285,11 @@ END
 sub midbuild_checkchanges () {
     my $pat = changespat $version;
     return if $rmchanges;
-    my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
-    @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
+    my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
+    @unwanted = grep {
+	$_ ne changespat $version,'source' and
+	$_ ne changespat $version,'multi'
+    } @unwanted;
     fail <<END
 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
 Suggest you delete @unwanted.
@@ -6291,13 +6299,13 @@ END
 
 sub midbuild_checkchanges_vanilla ($) {
     my ($wantsrc) = @_;
-    midbuild_checkchanges() if $wantsrc == 1;
+    midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
 }
 
 sub postbuild_mergechanges_vanilla ($) {
     my ($wantsrc) = @_;
-    if ($wantsrc == 1) {
-	in_parent {
+    if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
+	in_bpd {
 	    postbuild_mergechanges(undef);
 	};
     } else {
@@ -6309,13 +6317,13 @@ sub cmd_build {
     build_prep_early();
     my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
     my $wantsrc = massage_dbp_args \@dbp;
-    if ($wantsrc > 0) {
+    if ($wantsrc & WANTSRC_SOURCE) {
 	build_source();
 	midbuild_checkchanges_vanilla $wantsrc;
     } else {
 	build_prep();
     }
-    if ($wantsrc < 2) {
+    if ($wantsrc & WANTSRC_BUILDER) {
 	push @dbp, changesopts_version();
 	maybe_apply_patches_dirtily();
 	runcmd_ordryrun_local @dbp;
@@ -6339,7 +6347,7 @@ sub cmd_gbp_build {
     # orig is absent.
     my $upstreamversion = upstreamversion $version;
     my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
-    my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
+    my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
 
     if ($gbp_make_orig) {
 	clean_tree();
@@ -6382,7 +6390,7 @@ sub cmd_gbp_build {
 	}
     }
 
-    if ($wantsrc > 0) {
+    if ($wantsrc & WANTSRC_SOURCE) {
 	build_source();
 	midbuild_checkchanges_vanilla $wantsrc;
     } else {
@@ -6392,7 +6400,7 @@ sub cmd_gbp_build {
 	build_prep();
     }
     maybe_unapply_patches_again();
-    if ($wantsrc < 2) {
+    if ($wantsrc & WANTSRC_BUILDER) {
 	push @cmd, changesopts();
 	runcmd_ordryrun_local @cmd, @ARGV;
     }
@@ -6411,7 +6419,7 @@ sub build_source {
     build_prep();
     $sourcechanges = changespat $version,'source';
     if (act_local()) {
-	unlink "../$sourcechanges" or $!==ENOENT
+	unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
 	    or fail "remove $sourcechanges: $!";
     }
     $dscfn = dscfn($version);
@@ -6428,7 +6436,7 @@ sub build_source {
               ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
                $f eq srcfn($version, $&));
             printdebug "source copy, found $f - renaming\n";
-            rename "$playground/$f", "../$f" or $!==ENOENT
+            rename "$playground/$f", "$buildproductsdir/$f" or $!==ENOENT
               or fail "put in place new source file ($f): $!";
         }
     } else {
@@ -6440,7 +6448,7 @@ sub build_source {
     }
     runcmd_ordryrun_local qw(sh -ec),
       'exec >$1; shift; exec "$@"','x',
-      "../$sourcechanges",
+      "$buildproductsdir/$sourcechanges",
       @dpkggenchanges, qw(-S), changesopts();
 }
 
@@ -6455,7 +6463,7 @@ sub cmd_build_source {
 sub cmd_sbuild {
     build_source();
     midbuild_checkchanges();
-    in_parent {
+    in_bpd {
 	if (act_local()) {
 	    stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
 	    stat_exists $sourcechanges
@@ -6464,7 +6472,7 @@ sub cmd_sbuild {
 	runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
     };
     maybe_unapply_patches_again();
-    in_parent {
+    in_bpd {
 	postbuild_mergechanges(<<END);
 perhaps you need to pass -A ?  (sbuild's default is to build only
 arch-specific binaries; dgit 1.4 used to override that.)
@@ -6600,7 +6608,7 @@ END
     my @dfi = dsc_files_info();
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
-	my $here = "../$f";
+	my $here = "$buildproductsdir/$f";
 	if (lstat $here) {
 	    next if stat $here;
 	    fail "lstat $here works but stat gives $! !";
@@ -6861,9 +6869,9 @@ sub parseopts () {
 	    } elsif (m/^--(gbp|dpm)$/s) {
 		push @ropts, "--quilt=$1";
 		$quilt_mode = $1;
-	    } elsif (m/^--ignore-dirty$/s) {
+	    } elsif (m/^--(?:ignore|include)-dirty$/s) {
 		push @ropts, $_;
-		$ignoredirty = 1;
+		$includedirty = 1;
 	    } elsif (m/^--no-quilt-fixup$/s) {
 		push @ropts, $_;
 		$quilt_mode = 'nocheck';
@@ -7064,6 +7072,9 @@ sub parseopts_late_defaults () {
 
     $need_split_build_invocation ||= quiltmode_splitbrain();
 
+    fail "dgit: --include-dirty is not supported in split view quilt mode"
+	if $split_brain && $includedirty;
+
     if (!defined $cleanmode) {
 	local $access_forpush;
 	$cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
@@ -7072,6 +7083,11 @@ sub parseopts_late_defaults () {
 	badcfg "unknown clean-mode \`$cleanmode'" unless
 	    $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
     }
+
+    $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
+    $buildproductsdir //= '..';
+    $bpd_glob = $buildproductsdir;
+    $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
 }
 
 if ($ENV{$fakeeditorenv}) {