git-debrebase: classificaton generates Changelog type

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index a3733a989d62ee890af7a8c948fe54443c5846a5..a1d277e54c7a6bf82417eb28c3689ef2063d6432 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -136,11 +136,12 @@ sub get_commit ($) {
     return ($`,$');
 }
 
-sub D_DEB ()     { return 0x1; } # debian/ (not including debian/patches/)
-sub D_UPS ()     { return 0x2; } # upstream files
-sub D_PAT_ADD () { return 0x4; } # debian/patches/ extra patches at end
-sub D_PAT_OTH () { return 0x8; } # debian/patches other changes
-
+sub D_UPS ()      { 0x02; } # upstream files
+sub D_PAT_ADD ()  { 0x04; } # debian/patches/ extra patches at end
+sub D_PAT_OTH ()  { 0x08; } # debian/patches other changes
+sub D_DEB_CLOG () { 0x10; } # debian/ (not patches/ or changelog)
+sub D_DEB_OTH ()  { 0x20; } # debian/changelog
+sub DS_DEB ()     { D_DEB_CLOG | D_DEB_OTH; } # debian/ (not patches/)
 
 our $playprefix = 'debrebase';
 our $rd;
@@ -181,16 +182,19 @@ sub get_differs ($$) {
     };
 
     $rundiff->([qw(--name-only)], [], sub {
-        $differs |= $_ eq 'debian' ? D_DEB : D_UPS;
+        $differs |= $_ eq 'debian' ? DS_DEB : D_UPS;
     });
 
-    if ($differs & D_DEB) {
-       $differs &= ~D_DEB;
+    if ($differs & DS_DEB) {
+       $differs &= ~DS_DEB;
        $rundiff->([qw(--name-only -r)], [qw(debian)], sub {
-            $differs |= $_ eq m{^debian/patches/} ? D_PAT_OTH : D_DEB;
+            $differs |=
+               m{^debian/patches/}      ? D_PAT_OTH  :
+               $_ eq 'debian/changelog' ? D_DEB_CLOG :
+                                          D_DEB_OTH;
        });
        die "mysterious debian changes $x..$y"
-           unless $differs & (D_PAT_OTH|D_DEB);
+           unless $differs & (D_PAT_OTH|DS_DEB);
     }
 
     if ($differs & D_PAT_OTH) {
@@ -260,6 +264,7 @@ sub calculate_committer_authline () {
 #
 # Types:
 #   Packaging
+#   Changelog
 #   Upstream
 #   AddPatches
 #   Mixed
@@ -330,10 +335,14 @@ sub classify ($) {
            return $classify->(qw(AddPatches));
        } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
            return $unknown->("edits debian/patches");
-       } elsif ($d == D_DEB) {
+       } elsif ($d & DS_DEB and !($d & ~DS_DEB)) {
            my ($ty,$dummy) = git_cat_file "$ph[0]:debian";
            if ($ty eq 'tree') {
-               return $classify->(qw(Packaging));
+               if ($d == D_DEB_CLOG) {
+                   return $classify->(qw(Changelog));
+               } else {
+                   return $classify->(qw(Packaging));
+               }
            } elsif ($ty eq 'missing') {
                return $classify->(qw(BreakwaterStart));
            } else {
@@ -341,7 +350,7 @@ sub classify ($) {
            }
        } elsif ($d == D_UPS) {
            return $classify->(qw(Upstream));
-       } elsif ($d == (D_DEB|D_UPS)) {
+       } elsif ($d & DS_DEB and $d & D_UPS and !($d & ~(DS_DEB|D_UPS))) {
            return $classify->(qw(Mixed));
        } elsif ($d == 0) {
            return $unknown->("no changes");
@@ -390,8 +399,6 @@ sub classify ($) {
     my ($stype, $series) = git_cat_file "$t:debian/patches/series";
     my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
 
-@p = reverse @p; #xxx
-
     # 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
@@ -399,17 +406,25 @@ sub classify ($) {
     # way also there's also an easy rune to look for the upstream
     # patches (--topo-order).
 
-    my $prevbrw = 0;
-
-    if (@p == 2 &&
-       !$haspatches &&
-       !$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin
-       !($p[$prevbrw]{Differs} & ~D_DEB) &&
-       !($p[!$prevbrw]{Differs} & ~D_UPS)) {
-       return $classify->(qw(BreakwaterUpstreamMerge),
-                          OrigParents => [ $p[!$prevbrw] ]);
+    # The above tells us which way *we* will generate them.  But we
+    # might encounter ad-hoc breakwater merges generated manually,
+    # which might be the other way around.  In principle, in some odd
+    # situations, a breakwater merge might have two identical parents.
+    # In that case we guess which way round it is (ie, which parent
+    # has the upstream history).  The order of the 2-iteration loop
+    # controls which guess we make.
+
+    foreach my $prevbrw (qw(0 1)) {
+       if (@p == 2 &&
+           !$haspatches &&
+           !$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin
+           !($p[$prevbrw]{Differs} & ~DS_DEB) &&
+           !($p[!$prevbrw]{Differs} & ~D_UPS)) {
+           return $classify->(qw(BreakwaterUpstreamMerge),
+                              OrigParents => [ $p[!$prevbrw] ]);
+       }
+       # xxx multi-.orig upstreams
     }
-    # xxx multi-.orig upstreams
 
     return $unknown->("complex merge");
 }
@@ -484,7 +499,7 @@ sub walk ($;$$) {
            $cur = $p0;
            $rewrite_from_here->();
            next;
-       } elsif ($ty eq 'Packaging') {
+       } elsif ($ty eq 'Packaging' or $ty eq 'Changelog') {
            push @brw_cl, $cl;
            $cur = $p0;
            next;