X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=150c11539a46bee1a46c32d256a33a99061bdcf4;hp=653f4ce268c0e9946cf62111a88abaa2227e0117;hb=a94e7d03fb7ce841d3c07effc7988f3cb0ed1225;hpb=9d1e2dcc3134cdf8afdadc6538d2e796ee8008fa;ds=sidebyside

diff --git a/dgit b/dgit
index 653f4ce2..150c1153 100755
--- a/dgit
+++ b/dgit
@@ -97,8 +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
@@ -113,8 +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);
 
@@ -256,7 +256,7 @@ sub opts_opt_multi_cmd {
 }
 
 sub gbp_pq {
-    return (@gbp, qw(pq));
+    return opts_opt_multi_cmd @gbp_pq;
 }
 
 #---------- remote protocol support, common ----------
@@ -1566,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;
 
@@ -2629,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 () {
@@ -3636,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
@@ -3780,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';
@@ -3975,15 +3981,65 @@ 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/[.:]$//;
-	$patchname =~ y/ A-Z/-a-z/;
-	$patchname =~ y/-a-z0-9_.+=~//cd;
-	$patchname =~ s/^\W/x-$&/;
-	$patchname = substr($patchname,0,40);
+	my $patchname;
+	my $patchdir;
+
+	my $gbp_check_suitable = sub {
+	    $_ = shift;
+	    my ($what) = @_;
+
+	    eval {
+		die "contains unexpected slashes\n" if m{//} || m{/$};
+		die "contains leading punctuation\n" if m{^\W} || m{/\W};
+		die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
+		die "too long" if length > 200;
+	    };
+	    return $_ unless $@;
+	    print STDERR "quiltifying commit $cc:".
+		" ignoring/dropping Gbp-Pq $what: $@";
+	    return undef;
+	};
+
+	if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
+			   gbp-pq-name: \s* )
+		       (\S+) \s* \n //ixm) {
+	    $patchname = $gbp_check_suitable->($1, 'Name');
+	}
+	if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
+			   gbp-pq-topic: \s* )
+		       (\S+) \s* \n //ixm) {
+	    $patchdir = $gbp_check_suitable->($1, 'Topic');
+	}
+
+	$strip_nls->();
+
+	if (!defined $patchname) {
+	    $patchname = $title;
+	    $patchname =~ s/[.:]$//;
+	    $patchname =~ y/ A-Z/-a-z/;
+	    $patchname =~ y/-a-z0-9_.+=~//cd;
+	    $patchname =~ s/^\W/x-$&/;
+	    $patchname = substr($patchname,0,40);
+	}
+	if (!defined $patchdir) {
+	    $patchdir = '';
+	}
+	if (length $patchdir) {
+	    $patchname = "$patchdir/$patchname";
+	}
+	if ($patchname =~ m{^(.*)/}) {
+	    mkpath "debian/patches/$1";
+	}
+
 	my $index;
 	for ($index='';
 	     stat "debian/patches/$patchname$index";
@@ -4001,6 +4057,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);
@@ -4076,7 +4133,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 ($$$) {
@@ -4610,6 +4671,10 @@ sub cmd_build {
     printdone "build successful\n";
 }
 
+sub pre_gbp_build {
+    $quilt_mode //= 'gbp';
+}
+
 sub cmd_gbp_build {
     my @dbp = @dpkgbuildpackage;
 
@@ -5040,6 +5105,9 @@ if (!@ARGV) {
 my $cmd = shift @ARGV;
 $cmd =~ y/-/_/;
 
+my $pre_fn = ${*::}{"pre_$cmd"};
+$pre_fn->() if $pre_fn;
+
 if (!defined $rmchanges) {
     local $access_forpush;
     $rmchanges = access_cfg_bool(0, 'rm-old-changes');