X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=9573adf2f304b7fa7eac5290b618f013d46b0987;hb=42a4e12f8b0511c915d1f3e174ce724642605c81;hp=f65b51a73f356fd50c47596fec8572cfdbf73972;hpb=f014eb0c1a3acacf61b760af4c76f7d6233f5504;p=dgit.git

diff --git a/dgit b/dgit
index f65b51a7..9573adf2 100755
--- a/dgit
+++ b/dgit
@@ -551,13 +551,43 @@ sub pull () {
     printdone "fetched to ".lrref()." and merged into HEAD";
 }
 
+sub check_not_dirty () {
+    runcmd @git, qw(diff --quiet);
+}
+
+sub commit_quilty_patch ($) {
+    my ($vsn) = @_;
+    my $output = cmdoutput @git, qw(status --porcelain);
+    my %fixups = map {$_=>1}
+        (".pc/debian-changes-$vsn/","debian/patches/debian-changes-$vsn");
+    my @files;
+    foreach my $l (split /\n/, $output) {
+	next unless $l =~ s/^\?\? //;
+	next unless $fixups{$l};
+	push @files, $l;
+    }
+    print DEBUG "checking for quilty\n", Dumper(\@files);
+    if (@files == 2) {
+	my $m = "Commit Debian 3.0 (quilt) metadata";
+	print "$m\n";
+	runcmd_ordryrun @git, qw(add), @files;
+	runcmd_ordryrun @git, qw(commit -m), $m;
+    }
+}
+
 sub dopush () {
-    runcmd @git, qw(diff --quiet HEAD);
+    print DEBUG "actually entering push\n";
     my $clogp = parsechangelog();
     $package = $clogp->{Source};
     my $dscfn = "${package}_$clogp->{Version}.dsc";
     stat "../$dscfn" or die "$dscfn $!";
     $dsc = parsecontrol("../$dscfn");
+    print DEBUG "format $dsc->{Format}\n";
+    if ($dsc->{Format} eq '3.0 (quilt)') {
+	print "Format \`$dsc->{Format}', urgh\n";
+	commit_quilty_patch($dsc->{Version});
+    }
+    check_not_dirty();
     prep_ud();
     chdir $ud or die $!;
     print "checking that $dscfn corresponds to HEAD\n";
@@ -671,6 +701,7 @@ sub cmd_pull {
 sub cmd_push {
     parseopts();
     die if defined $package;
+    runcmd @git, qw(diff --quiet HEAD);
     my $clogp = parsechangelog();
     $package = $clogp->{Source};
     if (@ARGV==0) {
@@ -696,6 +727,7 @@ sub cmd_build {
     my $clogp = parsechangelog();
     $suite = $clogp->{Distribution};
     $package = $clogp->{Source};
+    canonicalise_suite() unless grep { m/^--git-debian-branch/ } @ARGV;
     runcmd_ordryrun
 	qw(git-buildpackage -us -uc --git-no-sign-tags),
 	'--git-builder=dpkg-buildpackage -i\.git/ -I.git',
@@ -703,6 +735,11 @@ sub cmd_build {
 	@ARGV;
 }
 
+sub cmd_quilt_fixup {
+    my $clogp = parsechangelog();
+    commit_quilty_patch($clogp->{Version});
+}
+
 sub parseopts () {
     my $om;
     while (@ARGV) {
@@ -752,5 +789,5 @@ parseopts();
 print STDERR "DRY RUN ONLY\n" if $dryrun;
 die unless @ARGV;
 my $cmd = shift @ARGV;
-
+$cmd =~ y/-/_/;
 { no strict qw(refs); &{"cmd_$cmd"}(); }