X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=git-debrebase;h=3578715679cb78b69feabed9841ba4e824ab7036;hb=6751d0fc1a0a3228fb62ef65206aebcc57b2acdf;hp=428f9e6cfb15898cf096ba5a8caf31db0f8391a5;hpb=c45f0c5ad270b47d54ce07c5a9f4ed5fb57d5083;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 428f9e6c..35787156 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -110,6 +110,11 @@ use Data::Dumper;
 
 use Debian::Dgit qw(:DEFAULT $wa);
 
+sub badusage ($) {
+    my ($m) = @_;
+    die "bad usage: $m\n";
+}
+
 sub cfg ($) {
     my ($k) = @_;
     $/ = "\0";
@@ -231,7 +236,14 @@ sub classify ($) {
 	} elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
 	    return $unknown->("edits debian/patches");
 	} elsif ($d == D_DEB) {
-	    return $classify->(qw(Packaging));
+	    my ($ty,$dummy) = git_cat_file "$ph[0]:debian";
+	    if ($ty eq 'tree') {
+		return $classify->(qw(Packaging));
+	    } elsif ($ty eq 'missing') {
+		return $classify->(qw(BreakwaterStart));
+	    } else {
+		return $unknown->("parent's debian is not a directory");
+	    }
 	} elsif ($d == D_UPS) {
 	    return $classify->(qw(Upstream));
 	} elsif ($d == (D_DEB|D_UPS)) {
@@ -302,20 +314,21 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub walk ($;$$$$);
+sub walk ($;$$);
 sub walk {
     my ($input,
-	$nogenerate,$report,
-	$wantdebonly,$depth) = @_;
-    # go through commits backwards
-    # we generate two lists of commits to apply
+	$nogenerate,$report) = @_;
     # => ($tip, $breakwater_tip)
-    my (@deb_cl, @ups_cl, @processed);
+    # (or nothing, if $nogenerate)
+
+    # go through commits backwards
+    # we generate two lists of commits to apply:
+    # breakwater branch and upstream patches
+    my (@brw_cl, @upp_cl, @processed);
     my %found;
+    my $upp_limit;
     my @pseudomerges;
 
-    $depth //= 0;
-
     my $cl;
     my $xmsg = sub {
 	my ($appendinfo) = @_;
@@ -325,36 +338,57 @@ sub walk {
 	return (Msg => $ms);
     };
     my $rewrite_from_here = sub {
-	push @processed, { SpecialMethod => 'StartRewrite' };
+	my $sp_cl = { SpecialMethod => 'StartRewrite' };
+	push @brw_cl, $sp_cl;
+	push @processed, $sp_cl;
     };
 
     my $cur = $input;
-    my $basis;
 
     my $prdelim = "";
     my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; };
 
+    my $prline = sub {
+	return unless $report;
+	print $report $prdelim, @_;
+	$prdelim = "\n";
+    };
+
+    my $bomb = sub { # usage: return $bomb->();
+	print $report " Unprocessable" if $report;
+	$prprdelim->();
+	if ($nogenerate) {
+	    return (undef,undef);
+	}
+	die "commit $cur: Cannot cope with this commit";
+    };
+
     for (;;) {
+	if (!defined $cur) {
+	    push @brw_cl, { ExactlyParents => [] };
+	    $prline->("Origin");
+	    last;
+	}
 	$cl = classify $cur;
 	my $ty = $cl->{Type};
 	my $st = $cl->{SubType};
-	if ($report) {
-	    print $report $prdelim, "$cl->{CommitId} $cl->{Type}";
-	    $prdelim = "\n";
-	}
+	$prline->("$cl->{CommitId} $cl->{Type}");
 	$found{$ty. ( defined($st) ? "-$st" : '' )}++;
 	push @processed, $cl;
-	my $p0 = $cl->{Parents}[0]{CommitId};
+	my $p0 = @{ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef;
 	if ($ty eq 'AddPatches') {
 	    $cur = $p0;
 	    $rewrite_from_here->();
 	    next;
 	} elsif ($ty eq 'Packaging') {
-	    push @deb_cl, $cl;
+	    push @brw_cl, $cl;
 	    $cur = $p0;
 	    next;
+	} elsif ($ty eq 'BreakwaterStart') {
+	    push @brw_cl, { ExactlyParents => [$cur] };
+	    last;
 	} elsif ($ty eq 'Upstream') {
-	    push @ups_cl, $cl;
+	    push @upp_cl, $cl;
 	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'Mixed') {
@@ -363,9 +397,10 @@ sub walk {
 		my $cls = { $cl, $xmsg->("split mixed commit: $wh part") };
 		push @$q, $cls;
 	    };
-	    $queue->(\@deb_cl, "debian");
-	    $queue->(\@ups_cl, "upstream");
+	    $queue->(\@brw_cl, "debian");
+	    $queue->(\@upp_cl, "upstream");
 	    $rewrite_from_here->();
+	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'Pseudomerge') {
 	    print $report " Contributor=$ty->{Contributor}" if $report;
@@ -374,55 +409,82 @@ sub walk {
 	    $cur = $ty->{Contributor};
 	    next;
 	} elsif ($ty eq 'BreakwaterUpstreamMerge') {
-	    $basis = $cur;
+	    push @brw_cl, { ExactlyParents => [$cur] };
+	    $prline->("PreviousBreakwater");
 	    last;
-	} elsif ($ty eq 'DgitImportUnpatched' &&
-		 @pseudomerges == 1) {
-	    # This import has a tree which is just like a breakwater
-	    # tree, but it has the wrong history.  Its ought to have
-	    # the previous breakwater (which dgit ought to have
-	    # generated a pseudomerge to overwrite) as an ancestor.
-	    # That will make the history of the debian/ files correct.
-	    # As for the upstream version: either it's the same upstream
-	    # as the previous breakwater, in which case that history is
-	    # precisely right.  Otherwise, it was a non-gitish upload
-	    # of a new upstream version.  We can tell these apart
-	    # by looking at the tree of the supposed upstream.
-	    my $differs = get_differs $previous_breakwater, $cl->{Tree};
-	    printf $report " Differs=%#x", $differs if $report;
-	    if ($differs & D_UPS) {
-		printf $report " D_UPS" if $report;
-		push @deb_cl, {
-                    %$cl,
-                    SpecialMethod => 'DgitImportUpstreamUpdate',
+	} elsif ($ty eq 'DgitImportUnpatched') {
+	    my $pm = $pseudomerges[-1];
+	    if (defined $pm) {
+		# To an extent, this is heuristic.  Imports don't have
+		# a useful history of the debian/ branch.  We assume
+		# that the first pseudomerge after an import has a
+		# useful history of debian/, and ignore the histories
+		# from later pseudomerges.  Often the first pseudomerge
+		# will be the dgit import of the upload to the actual
+		# suite intended by the non-dgit NMUer, and later
+		# pseudomerges may represent in-archive copies.
+		my $ovwrs = $pm->{Overwritten};
+		printf $report " PM=%s \@Overwr:%d", $pm, (scalar @$ovwrs)
+		    if $report;
+		if (@$ovwrs != 1) {
+		    return $bomb->();
+		}
+		my $ovwr = $ovwrs->[0]{CommitId};
+		printf $report " Overwr=%s", $ovwr if $report;
+		# This import has a tree which is just like a
+		# breakwater tree, but it has the wrong history.  It
+		# ought to have the previous breakwater (which the
+		# pseudomerge overwrote) as an ancestor.  That will
+		# make the history of the debian/ files correct.  As
+		# for the upstream version: either it's the same as
+		# was ovewritten (ie, same as the previous
+		# breakwater), in which case that history is precisely
+		# right; or, otherwise, it was a non-gitish upload of a
+		# new upstream version.  We can tell these apart by
+		# looking at the tree of the supposed upstream.
+		push @brw_cl, {
+		    %$cl,
+		    SpecialMethod => 'DgitImportDebianUpdate',
                     $xmsg->("convert dgit import: debian changes")
-                };
-	    }
-	    push @deb_cl, {
-		%$cl,
-		SpecialMethod => 'DgitImportDebianUpdate',
-                $xmsg->("convert dgit import: upstream changes")
-	    };
-	    $prprdelim->();
-	    $basis = walk
-		$pseudomerges[0]{Overwritten},
-		$nogenerate, $report,
-		1, $depth+1;
-	    $rewrite_from_here->();
-	    last;
-	} else {
-	    print $report " Unprocessable" if $report;
-	    $prprdelim->();
-	    if ($nogenerate) {
-		return (undef,undef);
+		};
+		my $differs = (get_differs $ovwr, $cl->{Tree});
+		printf $report " Differs=%#x", $differs if $report;
+		if ($differs & D_UPS) {
+		    printf $report " D_UPS" if $report;
+		    # This will also trigger if a non-dgit git-based NMU
+		    # deleted .gitignore (which is a thing that some of
+		    # the existing git tools do if the user doesn't
+		    # somehow tell them not to).  Ah well.
+		    push @brw_cl, {
+			%$cl,
+			SpecialMethod => 'DgitImportUpstreamUpdate',
+		        $xmsg->("convert dgit import: upstream changes")
+		    };
+		}
+		$prline->(" Import");
+		$rewrite_from_here->();
+		$upp_limit //= $#upp; # further, deeper, patches discarded
+		$cur = $ovwr;
+		next;
+	    } else {
+		# Everything is from this import.  This kind of import
+		# is already in valid breakwater format, with the
+		# patches as commits.
+		printf $report " NoPM" if $report;
+		$prline->(" ImportOrigin");
+		# last thing we processed will have been the first patch,
+		# if there is one; which is fine, so no need to rewrite
+		# on account of this import
+		push @brw_cl, { ExactlyParents => [$cur] };
+		last;
 	    }
-	    die "commit $cur: Cannot cope with this commit";
+	    die "$ty ?";
+        } else {
+	    return $bomb->();
 	}
     }
     $prprdelim->();
-    if ($nogenerate) {
-	return (undef, $basis);
-    }
+    return if $nogenerate;
 
     # Now we build it back up again
 
@@ -452,9 +514,9 @@ sub walk {
     in_workarea sub {
 	mkdir $rd or $!==EEXIST or die $!;
 	my $current_method;
-	foreach my $cl (qw(Debian), (reverse @deb_cl),
+	foreach my $cl (qw(Debian), (reverse @brw_cl),
 			{ SpecialMethod => 'RecordBreakwaterTip' },
-			qw(Upstream), (reverse @ups_cl)) {
+			qw(Upstream), (reverse @upp_cl)) {
 	    if (!ref $cl) {
 		$current_method = $cl;
 		next;
@@ -470,7 +532,7 @@ sub walk {
 		$rewriting = 1;
 		next;
 	    } elsif ($method eq 'RecordBreakwaterTip') {
-		last if $wantdebonly;
+		last if $wantbrwonly;
 		$breakwater = $build;
 		next;
 	    } elsif ($method eq 'DgitImportDebianUpdate') {
@@ -487,28 +549,28 @@ sub walk {
 	    my $ch = $cl->{Hdr};
 	    $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
 	    $ch =~ s{^parent .*\n}{}m;
-	    $ch =~ s{(?=^author}{
+	    $ch =~ s{(?=^author)}{
 		map { "parent $_\n" } @parents
 	    }me or confess "$ch ?";
-	    if ($rewrite) {
+	    if ($rewriting) {
 		$ch =~ s{^committer .*$}{$committer_authline}m
 		    or confess "$ch ?";
 	    }
-	    my $cf = "$rd/m$rewrite"
-		open CD, ">", $cf or die $!;
-	    print CD $ch, "\n", $cl->{Msg}; or die $!;
+	    my $cf = "$rd/m$rewriting";
+	    open CD, ">", $cf or die $!;
+	    print CD $ch, "\n", $cl->{Msg} or die $!;
 	    close CD or die $!;
 	    my @cmd = (@git, qw(hash-object));
-	    push @cmd, qw(-w) if $rewrite;
+	    push @cmd, qw(-w) if $rewriting;
 	    push @cmd, qw(-t commit), $cf;
 	    my $newcommit = cmdoutput @cmd;
-	    confess "$ch ?" unless $rewrite or $newcommit eq $cl->{CommitId};
+	    confess "$ch ?" unless $rewriting or $newcommit eq $cl->{CommitId};
 	    $build = $newcommit;
 	}
     };
 
     runcmd @git, qw(diff-tree --quiet),
-	map { $wantdebonly ? "$_:debian" : $_ },
+	map { $wantdebonly ? "$_:debian" : $_ }
 	$input, $build;
 
     return ($build, $breakwater);