+ foreach my $ph (@ph) {
+ push @p, {
+ Ix => $#p,
+ CommitId => $ph,
+ Differs => (get_differs $t, $ph),
+ };
+ }
+
+ my $classify = sub {
+ my ($type, @rest) = @_;
+ $r = { %$r, Type => $type, @rest };
+ return $r;
+ };
+ my $unknown = sub {
+ my ($why) = @_;
+ $r = { %$r, Type => qw(Unknown) };
+ return $r;
+ };
+
+ if (@p == 1) {
+ my $d = $r->{Parents}[0]{Differs};
+ if ($d == D_PAT_ADD) {
+ return $classify->(qw(AddPatches));
+ } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
+ return $unknown->("edits debian/patches");
+ } elsif ($d == D_DEB) {
+ 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)) {
+ return $classify->(qw(Mixed));
+ } elsif ($d == 0) {
+ return $unknown->("no changes");
+ } else {
+ confess "internal error $objid ?";
+ }
+ }
+ if (!@p) {
+ return $unknown->("origin commit");
+ }
+
+ my @identical = grep { !$_->{Differs} } @p;
+ if (@p == 2 && @identical == 1) {
+ my @overwritten = grep { $_->{Differs} } @p;
+ confess "internal error $objid ?" unless @overwritten==1;
+ return $classify->(qw(Pseudomerge),
+ Overwritten => $overwritten[0],
+ Contributor => $identical[0]);
+ }
+ if (@p == 2 && @identical == 2) {
+ my @bytime = nsort_by {
+ my ($ph,$pm) = get_commit $_->{CommitId};
+ $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?";
+ $1;
+ } @p;
+ return $classify->(qw(Pseudomerge),
+ SubType => qw(Ambiguous),
+ Overwritten => $bytime[0],
+ Contributor => $bytime[1]);
+ }
+ foreach my $p (@p) {
+ my ($p_h, $p_m) = get_commit $p;
+ $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
+ ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
+ }
+ my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' } @p;
+ my $m2 = $m;
+ if (!(grep { !$_->{IsOrigin} } @p) and
+ (@orig_ps >= @p - 1) and
+ $m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) {
+ $r->{NewMsg} = $m2;
+ return $classify->(qw(DgitImportUnpatched),
+ OrigParents => \@orig_ps);
+ }
+
+ my ($stype, $series) = git_cat_file "$t:debian/patches/series";
+ my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
+
+ # How to decide about l/r ordering of breakwater merges ? git
+ # --topo-order prefers to expand 2nd parent first. There's
+ # already an easy rune to look for debian/ history anyway (git log
+ # debian/) so debian breakwater branch should be 1st parent; that
+ # way also there's also an easy rune to look for the upstream
+ # patches (--topo-order).
+ if (@p == 2 &&
+ !$haspatches &&
+ !$p[0]{IsOrigin} && # breakwater merge never starts with an origin
+ !($p[0]{Differs} & ~D_DEB) &&
+ !($p[1]{Differs} & ~D_UPS)) {
+ return $classify->(qw(BreakwaterUpstreamMerge),
+ OrigParents => [ $p[1] ]);
+ }
+ # xxx multi-.orig upstreams
+
+ return $unknown->("complex merge");
+}
+
+sub walk ($;$$);
+sub walk ($;$$) {
+ my ($input,
+ $nogenerate,$report) = @_;
+ # => ($tip, $breakwater_tip)
+ # (or nothing, if $nogenerate)