X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=d5203877e21a519be2cc7c0508e83051e5a7b7f9;hp=fbb97329d549328ef775fc087e528904d462e872;hb=6b3e171761b577a6058e5ccb0bae9bf44cb17f0b;hpb=63911b5d576e7250c132d117c53e66aaf34b7f47

diff --git a/git-debrebase b/git-debrebase
index fbb97329..d5203877 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -19,13 +19,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # usages:
-#    git-debrebase launder     # prints breakwater tip
-#    git-debrebase analyse
-#    git-debrebase start       # like ffrebase start + debrebase launder
-#    git-debrebase create-new-upstream [-f] <upstreaminfo>
-#    git-debrebase new-upstream [-f] <upstreaminfo>
+#    git-debrebase status
+#    git-debrebase start       # like ffqrebase start + debrebase launder
+#    git-debrebase new-upstream [stuff]  # see below
 #    git-debrebase <git-rebase options>  # does debrebase start if necessary
 #
+#    git-debrebase analyse
+#    git-debrebase launder     # prints breakwater tip
+#    git-debrebase create-new-upstream-breakwater [-f] <upstreaminfo>...
+#
 # <upstreaminfo> is
 #    [,][<subdir>:][+]<commitid>[,...]
 #
@@ -34,9 +36,37 @@
 # xxx want auto branch names
 # xxx too complicated
 # how about for now
-#    [+]<commit> [<subdir:> [+]<commit>...]
+#    [+]<commit> [<subdir/> [+]<commit>...]
 # ?  plus options
 #     --new-upstream-different-subtrees
+#
+#  automatic case
+#       git-debrebase new-upstream
+#             - previous breakwater merge must be gdr-generated
+#             - orig set is the same as before
+#             - implicitly uses upstream branches according to orig set
+#             - not all upstream branches need be updated
+#             - insists on fast-forward of each branch, unless
+#                  --force (or --force=<subdir>[/])
+#  branch set adjustments
+#       git-debrebase new-upstream --add <subdir>/
+#       git-debrebase new-upstream --rm <subdir>/
+#       git-debrebase new-upstream / [<subdir>/ ...]
+#             - orig set is adjusted
+#             - otherwise like auto (--add is not checked for ffness, obv)
+#             - multiple --add and --rm may be specified
+#             - --add makes new upstream the last contributor
+#  explicit
+#       git-debrebase / [<rootcommitid>] [<subdir>/ [<commitid>] ...]
+#             - orig set is precisely as specified now
+#             - previous breakwater merge is irrelevant
+#             - no fast forward checks
+#  for now only explicit with commitids
+
+    # implicitly uses `upstream'
+#                                     # (or multiple other branches)
+#       git-debrebase new-upstream \
+#             [<subdir>/]=<commitid>
 
 #    UPSTREAM[,[[SUBDIR:]SUBUPSTREAM]
 #    default for SUBDIR: is from previous upstream merge[xxx terminology]
@@ -46,15 +76,16 @@
 # when starting must record original start (for ff)
 # and new rebase basis
 #
-#    git-ffrebase start [BASE] # records previous HEAD so it can be overwritten
-#                              # records base for future git-ffrebase
-#    git-ffrebase set-base BASE
-#    git-ffrebase <git-rebase options>
-#    git-ffrebase finish
-#    git-ffrebase status [BRANCH]
+#    git-ffqrebase start [BASE]
+#                # records previous HEAD so it can be overwritten
+#                # records base for future git-ffqrebase
+#    git-ffqrebase set-base BASE
+#    git-ffqrebase <git-rebase options>
+#    git-ffqrebase finish
+#    git-ffqrebase status [BRANCH]
 #
-#  refs/ffrebase-prev/BRANCH    BRANCH may be refs/...; if not it means
-#  refs/ffrebase-base/BRANCH      refs/heads/BRANCH
+#  refs/ffqrebase-prev/BRANCH    BRANCH may be refs/...; if not it means
+#  refs/ffqrebase-base/BRANCH      refs/heads/BRANCH
 #                               zero, one, or both of these may exist
 
 use strict;
@@ -84,10 +115,10 @@ sub get_commit ($) {
     return ($`,$');
 }
 
-sub D_DEB ()     { return 0x1; }
-sub D_UPS ()     { return 0x2; }
-sub D_PAT_ADD () { return 0x4; }
-sub D_PAT_OTH () { return 0x8; }
+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
 
 our $rd = ".git/git-debrebase";
 our $ud = "$rd/work";
@@ -99,12 +130,48 @@ sub commit_pr_info ($) {
 
 sub calculate_committer_authline () {
     my $c = cmdoutput @git, qw(commit-tree --no-gpg-sign -m),
-	'XXX DUMMY COMMIT (git-debrebase)', "$basis:";
+	'DUMMY COMMIT (git-debrebase)', "$basis:";
     my ($h,$m) = get_commit $c;
     $h =~ m/^committer .*$/m or confess "($h) ?";
     return $&;
 }
 
+# classify returns an info hash like this
+#   CommitId => $objid
+#   Hdr => # commit headers, including 1 final newline
+#   Msg => # commit message (so one newline is dropped)
+#   Tree => $treeobjid
+#   Type => (see below)
+#   Parents = [ {
+#       Ix => $index # ie 0, 1, 2, ...
+#       CommitId
+#       Differs => return value from get_differs
+#       IsOrigin
+#       IsDggitImport => 'orig' 'tarball' 'unpatched' 'package' (as from dgit)
+#     } ...]
+#   NewMsg => # commit message, but with any [dgit import ...] edited
+#             # to say "[was: ...]"
+#
+# Types:
+#   Packaging
+#   Upstream
+#   AddPatches
+#   Mixed
+#   Unknown
+#
+#   Pseudomerge
+#     has additional entres in classification result
+#       Overwritten = [ subset of Parents ]
+#       Contributor = $the_remaining_Parent
+#
+#   DgitImportUnpatched
+#     has additional entry in classification result
+#       OrigParents = [ subset of Parents ]
+#
+#   BreakwaterUpstreamMerge
+#     has additional entry in classification result
+#       OrigParents = [ subset of Parents ]
+
 sub classify ($) {
     my ($objid) = @_;
 
@@ -212,8 +279,9 @@ sub classify ($) {
 	!($p[0]{Differs} & ~D_DEB) &&
 	!($p[1]{Differs} & ~D_UPS)) {
 	return $classify->(qw(BreakwaterUpstreamMerge),
-			   Upstream => $p[1]);
+			   OrigParents => [ $p[1] ]);
     }
+    # xxx multi-.orig upstreams
 
     return $unknown->("complex merge");
 }
@@ -272,7 +340,13 @@ sub launder ($$$) {
 	    next;
 	} elsif ($ty eq 'Pseudomerge') {
 	    if (defined $pseudos_must_overwrite_this) {
-		confess 'xxx actually check this';
+		grep {
+		    is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
+		},
+		    @{ $cl->{Overwritten} }
+		or
+		    die "Pseudomerge $cl->{CommitId} does not overwrite ".
+		        "$pseudos_must_overwrite_this as expected.";
 	    }
 	    push @pseudomerges, $cl;
 	    $rewrite_from_here->();
@@ -316,7 +390,6 @@ sub launder ($$$) {
     # Now we build it back up again
 
     workarea_fresh();
-    in_workarea sub { xxx attributes xxx };
 
     my $rewriting = 1;
 
@@ -414,7 +487,7 @@ sub update_head ($$) {
 sub cmd_launder () {
     my $old = get_head();
     my ($tip,$breakwater) = launder $old, 0, undef, 0;
-    update_head $old, $tip, 'launder'; # no tree changes!
+    update_head $old, $tip, 'launder'; # no tree changes! xxx debian/patches
     printf "# breakwater tip:\n%s\n", $breakwater;
 }