X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=c208e4ea3779551f9dd5e3f870c4ad02b33caf69;hb=ec238523ed68bcff1b4a4a09cb511f8994649050;hp=fccf48e31d35aa775aed3ad9a5747d0d47a6b85e;hpb=f979515f2b1567e93fa3b3bb18ad026107ce14a3;p=dgit.git

diff --git a/dgit b/dgit
index fccf48e3..c208e4ea 100755
--- a/dgit
+++ b/dgit
@@ -82,7 +82,8 @@ our $quilt_mode;
 our $quilt_upstream_commitish;
 our $quilt_upstream_commitish_used;
 our $quilt_upstream_commitish_message;
-our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied|baredebian';
+our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball|\+git)?';
+our $quilt_modes_re = "linear|smash|auto|nofix|nocheck|unapplied|$quilt_options_re";
 our $splitview_mode;
 our $splitview_modes_re = qr{auto|always|never};
 our $dodep14tag;
@@ -299,6 +300,10 @@ sub deliberately_not_fast_forward () {
 sub quiltmode_splitting () {
     $quilt_mode =~ m/gbp|dpm|unapplied|baredebian/;
 }
+sub format_quiltmode_splitting ($) {
+    my ($format) = @_;
+    return madformat_wantfixup($format) && quiltmode_splitting();
+}
 
 sub do_split_brain () { !!($do_split_brain // confess) }
 
@@ -984,7 +989,7 @@ sub determine_whether_split_brain () {
 
     printdebug "format $format, quilt mode $quilt_mode\n";
 
-    if (madformat_wantfixup($format) && quiltmode_splitting()) {
+    if (format_quiltmode_splitting $format) {
 	$splitview_mode ne 'never' or
 	    fail f_ "dgit: quilt mode \`%s' (for format \`%s')".
 	            " implies split view, but split-view set to \`%s'",
@@ -2270,62 +2275,9 @@ sub dotdot_bpd_transfer_origs ($$$) {
     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";
-
-	printdebug "considering reusing $f: ";
-
-	if (link_ltarget "$upper_f,fetch", $f) {
-	    printdebug "linked (using ...,fetch).\n";
-	} elsif ((printdebug "($!) "),
-		 $! != ENOENT) {
-	    fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
-	} elsif (link_ltarget $upper_f, $f) {
-	    printdebug "linked.\n";
-	} elsif ((printdebug "($!) "),
-		 $! != ENOENT) {
-	    fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
-	} else {
-	    printdebug "absent.\n";
-	}
-
-	my $refetched;
-	complete_file_from_dsc('.', $fi, \$refetched)
-	    or next;
-
-	printdebug "considering saving $f: ";
-
-	if (rename_link_xf 1, $f, $upper_f) {
-	    printdebug "linked.\n";
-	} elsif ((printdebug "($@) "),
-		 $! != EEXIST) {
-	    fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
-	} elsif (!$refetched) {
-	    printdebug "no need.\n";
-	} elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
-	    printdebug "linked (using ...,fetch).\n";
-	} elsif ((printdebug "($@) "),
-		 $! != EEXIST) {
-	    fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
-	} else {
-	    printdebug "cannot.\n";
-	}
-    }
+sub import_tarball_tartrees ($$) {
+    my ($upstreamv, $dfi) = @_;
+    # cwd should be the playground
 
     # We unpack and record the orig tarballs first, so that we only
     # need disk space for one private copy of the unpacked source.
@@ -2335,14 +2287,13 @@ sub generate_commits_from_dsc () {
     my @tartrees;
     my $orig_f_base = srcfn $upstreamv, '';
 
-    foreach my $fi (@dfi) {
+    foreach my $fi (@$dfi) {
 	# We actually import, and record as a commit, every tarball
 	# (unless there is only one file, in which case there seems
 	# little point.
 
 	my $f = $fi->{Filename};
 	printdebug "import considering $f ";
-	(printdebug "only one dfi\n"), next if @dfi == 1;
 	(printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
 	(printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
 	my $compr_ext = $1;
@@ -2354,6 +2305,7 @@ sub generate_commits_from_dsc () {
 			  $compr_ext, $orig_f_part
 			 ), "\n";
 
+	my $path = $fi->{Path} // $f;
 	my $input = new IO::File $f, '<' or die "$f $!";
 	my $compr_pid;
 	my @compr_cmd;
@@ -2419,6 +2371,7 @@ sub generate_commits_from_dsc () {
             Sort => (!$orig_f_part         ? 2 :
 		     $orig_f_part =~ m/-/g ? 1 :
 		                             0),
+            OrigPart => $orig_f_part, # 'orig', 'orig-XXX', or undef 
             F => $f,
             Tree => $tree,
         };
@@ -2432,36 +2385,15 @@ sub generate_commits_from_dsc () {
 	$a->{F}    cmp $b->{F}
     } @tartrees;
 
-    my $any_orig = grep { $_->{Orig} } @tartrees;
-
-    my $dscfn = "$package.dsc";
-
-    my $treeimporthow = 'package';
-
-    open D, ">", $dscfn or die "$dscfn: $!";
-    print D $dscdata or die "$dscfn: $!";
-    close D or die "$dscfn: $!";
-    my @cmd = qw(dpkg-source);
-    push @cmd, '--no-check' if $dsc_checked;
-    if (madformat $dsc->{format}) {
-	push @cmd, '--skip-patches';
-	$treeimporthow = 'unpatched';
-    }
-    push @cmd, qw(-x --), $dscfn;
-    runcmd @cmd;
+    @tartrees;
+}
 
-    my ($tree,$dir) = mktree_in_ud_from_only_subdir(__ "source package");
-    if (madformat $dsc->{format}) { 
-	check_for_vendor_patches();
-    }
+sub import_tarball_commits ($$) {
+    my ($tartrees, $upstreamv) = @_;
+    # cwd should be a playtree which has a relevant debian/changelog
+    # fills in $tt->{Commit} for each one
 
-    my $dappliedtree;
-    if (madformat $dsc->{format}) {
-	my @pcmd = qw(dpkg-source --before-build .);
-	runcmd shell_cmd 'exec >/dev/null', @pcmd;
-	rmtree '.pc';
-	$dappliedtree = git_add_write_tree();
-    }
+    my $any_orig = grep { $_->{Orig} } @$tartrees;
 
     my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
     my $clogp;
@@ -2515,19 +2447,21 @@ sub generate_commits_from_dsc () {
     $changes =~ s/^\n//; # Changes: \n
     my $cversion = getfield $clogp, 'Version';
 
-    if (@tartrees) {
+    my $r1authline;
+    if (@$tartrees) {
 	$r1clogp //= $clogp; # maybe there's only one entry;
-	my $r1authline = clogp_authline $r1clogp;
+        $r1authline = clogp_authline $r1clogp;
 	# Strictly, r1authline might now be wrong if it's going to be
 	# unused because !$any_orig.  Whatever.
 
 	printdebug "import tartrees authline   $authline\n";
 	printdebug "import tartrees r1authline $r1authline\n";
 
-	foreach my $tt (@tartrees) {
+	foreach my $tt (@$tartrees) {
 	    printdebug "import tartree $tt->{F} $tt->{Tree}\n";
 
-	    my $mbody = f_ "Import %s", $tt->{F};
+	    # untranslated so that different people's imports are identical
+	    my $mbody = sprintf "Import %s", $tt->{F};
 	    $tt->{Commit} = hash_commit_text($tt->{Orig} ? <<END_O : <<END_T);
 tree $tt->{Tree}
 author $r1authline
@@ -2548,6 +2482,104 @@ END_T
 	}
     }
 
+    return ($authline, $r1authline, $clogp, $changes);
+}
+
+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";
+
+	printdebug "considering reusing $f: ";
+
+	if (link_ltarget "$upper_f,fetch", $f) {
+	    printdebug "linked (using ...,fetch).\n";
+	} elsif ((printdebug "($!) "),
+		 $! != ENOENT) {
+	    fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
+	} elsif (link_ltarget $upper_f, $f) {
+	    printdebug "linked.\n";
+	} elsif ((printdebug "($!) "),
+		 $! != ENOENT) {
+	    fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
+	} else {
+	    printdebug "absent.\n";
+	}
+
+	my $refetched;
+	complete_file_from_dsc('.', $fi, \$refetched)
+	    or next;
+
+	printdebug "considering saving $f: ";
+
+	if (rename_link_xf 1, $f, $upper_f) {
+	    printdebug "linked.\n";
+	} elsif ((printdebug "($@) "),
+		 $! != EEXIST) {
+	    fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
+	} elsif (!$refetched) {
+	    printdebug "no need.\n";
+	} elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
+	    printdebug "linked (using ...,fetch).\n";
+	} elsif ((printdebug "($@) "),
+		 $! != EEXIST) {
+	    fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
+	} else {
+	    printdebug "cannot.\n";
+	}
+    }
+
+    my @tartrees;
+    @tartrees = import_tarball_tartrees($upstreamv, \@dfi)
+	unless @dfi == 1; # only one file in .dsc
+
+    my $dscfn = "$package.dsc";
+
+    my $treeimporthow = 'package';
+
+    open D, ">", $dscfn or die "$dscfn: $!";
+    print D $dscdata or die "$dscfn: $!";
+    close D or die "$dscfn: $!";
+    my @cmd = qw(dpkg-source);
+    push @cmd, '--no-check' if $dsc_checked;
+    if (madformat $dsc->{format}) {
+	push @cmd, '--skip-patches';
+	$treeimporthow = 'unpatched';
+    }
+    push @cmd, qw(-x --), $dscfn;
+    runcmd @cmd;
+
+    my ($tree,$dir) = mktree_in_ud_from_only_subdir(__ "source package");
+    if (madformat $dsc->{format}) { 
+	check_for_vendor_patches();
+    }
+
+    my $dappliedtree;
+    if (madformat $dsc->{format}) {
+	my @pcmd = qw(dpkg-source --before-build .);
+	runcmd shell_cmd 'exec >/dev/null', @pcmd;
+	rmtree '.pc';
+	$dappliedtree = git_add_write_tree();
+    }
+
+    my ($authline, $r1authline, $clogp, $changes) =
+	import_tarball_commits(\@tartrees, $upstreamv);
+
+    my $cversion = getfield $clogp, 'Version';
+
     printdebug "import main commit\n";
 
     open C, ">../commit.tmp" or confess "$!";
@@ -2667,7 +2699,10 @@ END
 	if ($vcmp < 0) {
 	    @output = ($rawimport_mergeinput, $lastpush_mergeinput,
 		{ ReverseParents => 1,
-		  Message => (f_ <<END, $package, $cversion, $csuite) });
+		  # untranslated so that different people's pseudomerges
+		  # are not needlessly different (although they will
+		  # still differ if the series of pulls is different)
+		  Message => (sprintf <<END, $package, $cversion, $csuite) });
 Record %s (%s) in archive suite %s
 END
 	} elsif ($vcmp > 0) {
@@ -4330,7 +4365,7 @@ sub push_mktags ($$ $$ $) {
     # We make the git tag by hand because (a) that makes it easier
     # to control the "tagger" (b) we can do remote signing
     my $authline = clogp_authline $clogp;
-    my $delibs = join(" ", "",@deliberatelies);
+    my @dtxinfo = @deliberatelies;
 
     my $mktag = sub {
 	my ($tw) = @_;
@@ -4351,8 +4386,9 @@ END
 %s release %s for %s (%s) [dgit]
 ENDT
 		or confess "$!";
+	    my $dtxinfo = join(" ", "",@dtxinfo);
 	    print TO <<END or confess "$!";
-[dgit distro=$declaredistro$delibs]
+[dgit distro=$declaredistro$dtxinfo]
 END
 	    foreach my $ref (sort keys %previously) {
 		print TO <<END or confess "$!";
@@ -5415,7 +5451,7 @@ END
 	my $upsversion = upstreamversion $version;
 	my $merge = make_commit
 	    [ $headref, $quilt_upstream_commitish ],
-	    [ +(f_ <<ENDT, $upsversion), <<ENDU ];
+ [ +(f_ <<ENDT, $upsversion), $quilt_upstream_commitish_message, <<ENDU ];
 Combine debian/ with upstream source for %s
 ENDT
 [dgit ($our_version) baredebian-merge $version $quilt_upstream_commitish_used]
@@ -6040,6 +6076,30 @@ sub quilt_check_splitbrain_cache ($$) {
     return (undef, $splitbrain_cachekey);
 }
 
+sub baredebian_origtarballs_scan ($$$) {
+    my ($fakedfi, $upstreamversion, $dir) = @_;
+    if (!opendir OD, $dir) {
+	return if $! == ENOENT;
+	fail "opendir $dir (origs): $!";
+    }
+
+    while ($!=0, defined(my $leaf = readdir OD)) {
+	{
+	    local ($debuglevel) = $debuglevel-1;
+	    printdebug "BDOS $dir $leaf ?\n";
+	}
+	next unless is_orig_file_of_vsn $leaf, $upstreamversion;
+	next if grep { $_->{Filename} eq $leaf } @$fakedfi;
+	push @$fakedfi, {
+            Filename => $leaf,
+            Path => "$dir/$leaf",
+			};
+    }
+
+    die "$dir; $!" if $!;
+    closedir OD;
+}
+
 sub quilt_fixup_multipatch ($$$) {
     my ($clogp, $headref, $upstreamversion, $splitbrain_cachekey) = @_;
 
@@ -6193,7 +6253,74 @@ END
     my $uheadref = $headref;
     my $uhead_whatshort = 'HEAD';
 
-    if ($quilt_mode =~ m/baredebian/) {
+    if ($quilt_mode =~ m/baredebian\+tarball/) {
+	# We need to make a tarball import.  Yuk.
+	# We want to do this here so that we have a $uheadref value
+
+	my @fakedfi;
+	baredebian_origtarballs_scan \@fakedfi, $upstreamversion, bpd_abs();
+	baredebian_origtarballs_scan \@fakedfi, $upstreamversion,
+	    "$maindir/.." unless $buildproductsdir eq '..';
+	changedir '..';
+
+	my @tartrees = import_tarball_tartrees $upstreamversion, \@fakedfi;
+
+	fail __ "baredebian quilt fixup: could not find any origs"
+	    unless @tartrees;
+
+	changedir 'work';
+	my ($authline, $r1authline, $clogp,) =
+	    import_tarball_commits \@tartrees, $upstreamversion;
+
+	if (@tartrees == 1) {
+	    $uheadref = $tartrees[0]{Commit};
+	    # TRANSLATORS: this translation must fit in the ASCII art
+	    # quilt differences display.  The untranslated display
+	    # says %9.9s, so with that display it must be at most 9
+	    # characters.
+	    $uhead_whatshort = __ 'tarball';
+	} else {
+	    # on .dsc import we do not make a separate commit, but
+	    # here we need to do so
+	    rm_subdir_cached '.';
+	    my $parents;
+	    foreach my $ti (@tartrees) {
+		my $c = $ti->{Commit};
+		if ($ti->{OrigPart} eq 'orig') {
+		    runcmd qw(git read-tree), $c;
+		} elsif ($ti->{OrigPart} =~ m/orig-/) {
+		    read_tree_subdir $', $c;
+		} else {
+		    confess "$ti->OrigPart} ?"
+		}
+		$parents .= "parent $c\n";
+	    }
+	    my $tree = git_write_tree();
+	    my $mbody = f_ 'Combine orig tarballs for %s %s',
+		$package, $upstreamversion;
+	    $uheadref = hash_commit_text <<END;
+tree $tree
+${parents}author $r1authline
+committer $r1authline
+
+$mbody
+
+[dgit import tarballs combine $package $upstreamversion]
+END
+	    # TRANSLATORS: this translation must fit in the ASCII art
+	    # quilt differences display.  The untranslated display
+	    # says %9.9s, so with that display it must be at most 9
+	    # characters.  This fragmentt is referring to multiple
+	    # orig tarballs in a source package.
+	    $uhead_whatshort = __ 'tarballs';
+
+	    runcmd @git, qw(reset -q);
+	}
+	$quilt_upstream_commitish = $uheadref;
+	$quilt_upstream_commitish_used = '*orig*';
+	$quilt_upstream_commitish_message = '';
+    }
+    if ($quilt_mode =~ m/baredebian$/) {
 	$uheadref = $quilt_upstream_commitish;
 	# TRANSLATORS: this translation must fit in the ASCII art
 	# quilt differences display.  The untranslated display
@@ -6228,9 +6355,10 @@ END
     # TRANSLATORS: Try to keep this ascii-art layout right.  The 0s in
     # %9.00009s will be ignored and are there to make the format the
     # same length (9 characters) as the output it generates.  If you
-    # change the value 9, your translation of "upstream" must fit into
-    # the new length, and you should change the number of 0s.  Do
-    # not reduce it below 4 as HEAD has to fit too.
+    # change the value 9, your translations of "upstream" and
+    # 'tarball' must fit into the new length, and you should change
+    # the number of 0s.  Do not reduce it below 4 as HEAD has to fit
+    # too.
     progress f_
 "%s: quilt differences: src:  %s orig %s     gitignores:  %s orig %s\n".
 "%s: quilt differences: %9.00009s %s o+d/p          %9.00009s %s o+d/p",
@@ -6389,6 +6517,18 @@ sub clean_tree_check () {
 sub clean_tree () {
     # We always clean the tree ourselves, rather than leave it to the
     # builder (dpkg-source, or soemthing which calls dpkg-source).
+    if ($quilt_mode =~ m/baredebian/ and $cleanmode =~ m/git/) {
+	fail f_ <<END, $quilt_mode, $cleanmode;
+quilt mode %s (generally needs untracked upstream files)
+contradicts clean mode %s (which would delete them)
+END
+	# This is not 100% true: dgit build-source and push-source
+	# (for example) could operate just fine with no upstream
+	# source in the working tree.  But it doesn't seem likely that
+	# the user wants dgit to proactively delete such things.
+	# -wn, for example, would produce identical output without
+	# deleting anything from the working tree.
+    }
     if ($cleanmode =~ m{^dpkg-source}) {
 	my @cmd = @dpkgbuildpackage;
 	push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
@@ -7381,7 +7521,7 @@ sub parseopts () {
 		push @ropts, $_;
 		my $cmd = shift @$om;
 		@$om = ($cmd, grep { $_ ne $2 } @$om);
-	    } elsif (m/^--(gbp|dpm|baredebian)$/s) {
+	    } elsif (m/^--($quilt_options_re)$/s) {
 		push @ropts, "--quilt=$1";
 		$quilt_mode = $1;
 	    } elsif (m/^--(?:ignore|include)-dirty$/s) {
@@ -7581,6 +7721,7 @@ sub parseopts_late_defaults () {
 	    or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
 	$quilt_mode = $1;
     }
+    $quilt_mode =~ s/^(baredebian)\+git$/$1/;
 
     foreach my $moc (@modeopt_cfgs) {
 	local $access_forpush;