X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=357adc98aac352197b771717cf3e0a6f017d36fc;hp=3a737d0b0bbd607dc002542fdd9f582bf14edfaa;hb=472edf9ca063494baf017ed891baa34d0ac057be;hpb=2a7411655b752fddfc8955f2967dbdc504d50451

diff --git a/dgit b/dgit
index 3a737d0b..357adc98 100755
--- a/dgit
+++ b/dgit
@@ -189,11 +189,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"; }
@@ -962,59 +957,6 @@ sub access_giturl (;$) {
     return "$url/$package$suffix";
 }	       
 
-sub parsecontrolfh ($$;$) {
-    my ($fh, $desc, $allowsigned) = @_;
-    our $dpkgcontrolhash_noissigned;
-    my $c;
-    for (;;) {
-	my %opts = ('name' => $desc);
-	$opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
-	$c = Dpkg::Control::Hash->new(%opts);
-	$c->parse($fh,$desc) or die "parsing of $desc failed";
-	last if $allowsigned;
-	last if $dpkgcontrolhash_noissigned;
-	my $issigned= $c->get_option('is_pgp_signed');
-	if (!defined $issigned) {
-	    $dpkgcontrolhash_noissigned= 1;
-	    seek $fh, 0,0 or die "seek $desc: $!";
-	} elsif ($issigned) {
-	    fail "control file $desc is (already) PGP-signed. ".
-		" Note that dgit push needs to modify the .dsc and then".
-		" do the signature itself";
-	} else {
-	    last;
-	}
-    }
-    return $c;
-}
-
-sub parsecontrol {
-    my ($file, $desc, $allowsigned) = @_;
-    my $fh = new IO::Handle;
-    open $fh, '<', $file or die "$file: $!";
-    my $c = parsecontrolfh($fh,$desc,$allowsigned);
-    $fh->error and die $!;
-    close $fh;
-    return $c;
-}
-
-sub getfield ($$) {
-    my ($dctrl,$field) = @_;
-    my $v = $dctrl->{$field};
-    return $v if defined $v;
-    fail "missing field $field in ".$dctrl->get_option('name');
-}
-
-sub parsechangelog {
-    my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
-    my $p = new IO::Handle;
-    my @cmd = (qw(dpkg-parsechangelog), @_);
-    open $p, '-|', @cmd or die $!;
-    $c->parse($p);
-    $?=0; $!=0; close $p or failedcmd @cmd;
-    return $c;
-}
-
 sub commit_getclogp ($) {
     # Returns the parsed changelog hashref for a particular commit
     my ($objid) = @_;
@@ -2342,22 +2284,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";
@@ -2383,7 +2317,7 @@ sub generate_commits_from_dsc () {
 	# version).  Then it remains to choose between the physically
 	# last entry in the file, and the one with the lowest version
 	# number.  If these are not the same, we guess that the
-	# versions were created in a non-monotic order rather than
+	# versions were created in a non-monotonic order rather than
 	# that the changelog entries have been misordered.
 
 	printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
@@ -2392,9 +2326,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!";
 
@@ -3812,11 +3744,11 @@ sub quiltify_nofix_bail ($$) {
 }
 
 sub commit_quilty_patch () {
-    my $output = cmdoutput @git, qw(status --porcelain);
+    my $output = cmdoutput @git, qw(status --ignored --porcelain);
     my %adds;
     foreach my $l (split /\n/, $output) {
 	next unless $l =~ m/\S/;
-	if ($l =~ m{^(?:\?\?| [MADRC]) (.pc|debian/patches)}) {
+	if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
 	    $adds{$1}++;
 	}
     }
@@ -5318,7 +5250,7 @@ END
 	print SERIES "\n" or die $! unless $newline eq "\n";
 	print SERIES "auto-gitignore\n" or die $!;
 	close SERIES or die  $!;
-        runcmd @git, qw(add -- debian/patches/series), $gipatch;
+        runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
         commit_admin <<END
 Commit patch to update .gitignore