X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=8d13d15a4e305238bea9b621cc39f8e0bf809c08;hp=cdf16700d4b9053f146731f6b68382a3e9f88cde;hb=934524a7a8f9fbcd193f0b21bac392e9444912e4;hpb=305822addb2da1b3742cfabdfa71be50c39c48c1

diff --git a/dgit b/dgit
index cdf16700..8d13d15a 100755
--- a/dgit
+++ b/dgit
@@ -97,7 +97,8 @@ our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
 our (@dpkggenchanges) = qw(dpkg-genchanges);
 our (@mergechanges) = qw(mergechanges -f);
-our (@gbp) = qw(gbp);
+our (@gbp_build) = ('');
+our (@gbp_pq) = ('gbp pq');
 our (@changesopts) = ('');
 
 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
@@ -112,7 +113,8 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
                      'dpkg-source' => \@dpkgsource,
                      'dpkg-buildpackage' => \@dpkgbuildpackage,
                      'dpkg-genchanges' => \@dpkggenchanges,
-                     'gbp' => \@gbp,
+                     'gbp-build' => \@gbp_build,
+                     'gbp-pq' => \@gbp_pq,
                      'ch' => \@changesopts,
                      'mergechanges' => \@mergechanges);
 
@@ -246,6 +248,17 @@ sub quiltmode_splitbrain () {
     $quilt_mode =~ m/gbp|dpm|unapplied/;
 }
 
+sub opts_opt_multi_cmd {
+    my @cmd;
+    push @cmd, split /\s+/, shift @_;
+    push @cmd, @_;
+    @cmd;
+}
+
+sub gbp_pq {
+    return opts_opt_multi_cmd @gbp_pq;
+}
+
 #---------- remote protocol support, common ----------
 
 # remote push initiator/responder protocol:
@@ -1553,6 +1566,7 @@ sub check_for_vendor_patches () {
 
 sub generate_commits_from_dsc () {
     # See big comment in fetch_from_archive, below.
+    # See also README.dsc-import.
     prep_ud();
     changedir $ud;
 
@@ -1843,7 +1857,14 @@ END
 	local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
 	local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
-	runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
+	eval {
+	    runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output',
+		gbp_pq, qw(import);
+	};
+	if ($@) {
+	    { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
+	    die $@;
+	}
 
 	my $gapplied = git_rev_parse('HEAD');
 	my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
@@ -2609,7 +2630,11 @@ sub commit_quilty_patch () {
     }
     my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
     runcmd_ordryrun_local @git, qw(add -f), @adds;
-    commit_admin "Commit Debian 3.0 (quilt) metadata";
+    commit_admin <<END
+Commit Debian 3.0 (quilt) metadata
+
+[dgit ($our_version) quilt-fixup]
+END
 }
 
 sub get_source_format () {
@@ -3616,13 +3641,10 @@ sub quiltify_dpkg_commit ($$$;$) {
     mkpath '.git/dgit';
     my $descfn = ".git/dgit/quilt-description.tmp";
     open O, '>', $descfn or die "$descfn: $!";
-    $msg =~ s/\s+$//g;
-    $msg =~ s/\n/\n /g;
-    $msg =~ s/^\s+$/ ./mg;
+    $msg =~ s/\n+/\n\n/;
     print O <<END or die $!;
-Description: $msg
-Author: $author
-$xinfo
+From: $author
+${xinfo}Subject: $msg
 ---
 
 END
@@ -3716,7 +3738,7 @@ END
 	($diffbits->{O2A} & 01)) { # some patches
 	quiltify_splitbrain_needed();
 	progress "dgit view: creating patches-applied version using gbp pq";
-	runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
+	runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
 	# gbp pq import creates a fresh branch; push back to dgit-view
 	runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
 	runcmd @git, qw(checkout -q dgit-view);
@@ -3760,7 +3782,11 @@ END
 	print SERIES "auto-gitignore\n" or die $!;
 	close SERIES or die  $!;
         runcmd @git, qw(add -- debian/patches/series), $gipatch;
-        commit_admin "Commit patch to update .gitignore";
+        commit_admin <<END
+Commit patch to update .gitignore
+
+[dgit ($our_version) update-gitignore-quilt-fixup]
+END
     }
 
     my $dgitview = git_rev_parse 'refs/heads/dgit-view';
@@ -3955,8 +3981,14 @@ sub quiltify ($$$$) {
 	$commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
 	my $author = $1;
 
+	my $commitdate = cmdoutput
+	    @git, qw(log -n1 --pretty=format:%aD), $cc;
+
 	$msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
 
+	my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
+	$strip_nls->();
+
 	my $title = $1;
 	my $patchname = $title;
 	$patchname =~ s/[.:]$//;
@@ -3981,6 +4013,7 @@ sub quiltify ($$$$) {
 	runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
 
 	quiltify_dpkg_commit "$patchname$index", $author, $msg,
+	    "Date: $commitdate\n".
 	    "X-Dgit-Generated: $clogp->{Version} $cc\n";
 
 	runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
@@ -4056,7 +4089,11 @@ sub quilt_fixup_linkorigs ($$) {
 
 sub quilt_fixup_delete_pc () {
     runcmd @git, qw(rm -rqf .pc);
-    commit_admin "Commit removal of .pc (quilt series tracking data)";
+    commit_admin <<END
+Commit removal of .pc (quilt series tracking data)
+
+[dgit ($our_version) upgrade quilt-remove-pc]
+END
 }
 
 sub quilt_fixup_singlepatch ($$$) {
@@ -4595,12 +4632,15 @@ sub cmd_gbp_build {
 
     my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
 
-    my @cmd;
-    if (length executable_on_path('git-buildpackage')) {
-	@cmd = qw(git-buildpackage);
-    } else {
-	@cmd = qw(gbp buildpackage);
+    if (!length $gbp_build[0]) {
+	if (length executable_on_path('git-buildpackage')) {
+	    $gbp_build[0] = qw(git-buildpackage);
+	} else {
+	    $gbp_build[0] = 'gbp buildpackage';
+	}
     }
+    my @cmd = opts_opt_multi_cmd @gbp_build;
+
     push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
 
     if ($wantsrc > 0) {