X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=cc51f775889c2e987e7c0f209721fc8d4b7f1fe4;hp=5fcec5461a2e51143de9818b50ad09aa6e0516db;hb=2c114c6b1f068b19deecc2a5602c3f15d56d6209;hpb=2b440473af773ab13334f8b79537c7a3153e4e4f

diff --git a/git-debrebase b/git-debrebase
index 5fcec546..cc51f775 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -28,12 +28,13 @@
 #
 #    git-debrebase [<options> --] [<git-rebase options...>]
 #    git-debrebase [<options>] analyse
+#    git-debrebase [<options>] breakwater      # prints breakwater tip only
 #    git-debrebase [<options>] launder         # prints breakwater tip etc.
 #    git-debrebase [<options>] stitch [--prose=<for commit message>]
 #    git-debrebase [<options>] downstream-rebase-launder-v0  # experimental
 #
-#    git-debrebase [<options>] gbp2debrebase-v0 \
-#             <upstream>
+#    git-debrebase [<options>] convert-from-gbp [<upstream-git-rev>]
+#    git-debrebase [<options>] convert-to-gbp
 
 # problems / outstanding questions:
 #
@@ -318,7 +319,6 @@ sub any_fproblems () {
 #   Upstream
 #   AddPatches
 #   Mixed
-#   Unknown
 #
 #   Pseudomerge
 #     has additional entres in classification result
@@ -332,6 +332,10 @@ sub any_fproblems () {
 #   BreakwaterUpstreamMerge
 #     has additional entry in classification result
 #       OrigParents = [ subset of Parents ]  # singleton list
+#
+#   Unknown
+#     has additional entry in classification result
+#       Why => "prose"
 
 sub parsecommit ($;$) {
     my ($objid, $p_ref) = @_;
@@ -390,7 +394,7 @@ sub classify ($) {
     };
     my $unknown = sub {
 	my ($why) = @_;
-	$r = { %$r, Type => qw(Unknown) };
+	$r = { %$r, Type => qw(Unknown), Why => $why };
 	printdebug " ** Unknown\n";
 	return $r;
     };
@@ -442,7 +446,7 @@ sub classify ($) {
 	my @overwritten = grep { $_->{Differs} } @p;
 	confess "internal error $objid ?" unless @overwritten==1;
 	return $classify->(qw(Pseudomerge),
-			   Overwritten => $overwritten[0],
+			   Overwritten => [ $overwritten[0] ],
 			   Contributor => $identical[0]);
     }
     if (@p == 2 && @identical == 2) {
@@ -453,7 +457,7 @@ sub classify ($) {
 	} @p;
 	return $classify->(qw(Pseudomerge),
 			   SubType => qw(Ambiguous),
-			   Overwritten => $bytime[0],
+			   Overwritten => [ $bytime[0] ],
 			   Contributor => $bytime[1]);
     }
     foreach my $p (@p) {
@@ -506,6 +510,42 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
+sub breakwater_of ($) {
+    my ($head) = @_; # must be laundered
+    my $breakwater;
+    my $unclean = sub {
+	my ($why) = @_;
+	fail "branch needs laundering (run git-debrebase): $why";
+    };
+    for (;;) {
+	my $cl = classify $head;
+	my $ty = $cl->{Type};
+	if ($ty eq 'Packaging' or
+	    $ty eq 'Changelog') {
+	    $breakwater //= $head;
+	} elsif ($ty eq 'BreakwaterUpstreamMerge' or
+		 $ty eq 'BreakwaterStart') {
+	    $breakwater //= $head;
+	    last;
+	} elsif ($ty eq 'Upstream') {
+	    $unclean->("packaging change ($breakwater)".
+		       " follows upstream change (eg $head)")
+		if defined $breakwater;
+	} elsif ($ty eq 'Mixed') {
+	    $unclean->('found mixed upstream/packaging commit ($head)');
+	} elsif ($ty eq 'Pseudomerge' or
+		 $ty eq 'AddPatches') {
+	    $unclean->("found interchange conversion commit ($ty, $head)");
+	} elsif ($ty eq 'DgitImportUnpatched') {
+	    $unclean->("found dgit dsc import ($head)");
+	} else {
+	    fail "found unprocessable commit, cannot cope: $head; $cl->{Why}";
+	}
+	$head = $cl->{Parents}[0]{CommitId};
+    }
+    return $breakwater;
+}
+
 sub walk ($;$$);
 sub walk ($;$$) {
     my ($input,
@@ -627,7 +667,8 @@ sub walk ($;$$) {
 		# 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)
+		printf $report " PM=%s \@Overwr:%d",
+		    $pm->{CommitId}, (scalar @$ovwrs)
 		    if $report;
 		if (@$ovwrs != 1) {
                     printdebug "*** WALK BOMB DgitImportUnpatched\n";
@@ -650,26 +691,15 @@ sub walk ($;$$) {
 		    %$cl,
 		    SpecialMethod => 'DgitImportDebianUpdate',
                     $xmsg->("convert dgit import: debian changes")
+		}, {
+		    %$cl,
+		    SpecialMethod => 'DgitImportUpstreamUpdate',
+                    $xmsg->("convert dgit import: upstream update",
+			    " breakwater")
 		};
-		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",
-				" breakwater")
-		    };
-		}
 		$prline->(" Import");
 		$rewrite_from_here->();
 		$upp_limit //= $#upp_cl; # further, deeper, patches discarded
-                die 'BUG $upp_limit is not used anywhere?';
 		$cur = $ovwr;
 		next;
 	    } else {
@@ -711,6 +741,8 @@ sub walk ($;$$) {
 	runcmd @git, qw(read-tree), $treeish;
 	$read_tree_debian->($build);
     };
+
+    $#upp_cl = $upp_limit if defined $upp_limit;
  
     my $committer_authline = calculate_committer_authline();
 
@@ -746,8 +778,10 @@ sub walk ($;$$) {
 		next;
 	    } elsif ($method eq 'DgitImportDebianUpdate') {
 		$read_tree_debian->($cltree);
-		rm_subdir_cached qw(debian/patches);
 	    } elsif ($method eq 'DgitImportUpstreamUpdate') {
+ 		confess unless $rewriting;
+		my $differs = (get_differs $build, $cltree);
+		next unless $differs & D_UPS;
 		$read_tree_upstream->($cltree);
 		push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
 	    } else {
@@ -763,7 +797,7 @@ sub walk ($;$$) {
 	    my $newtree = cmdoutput @git, qw(write-tree);
 	    my $ch = $cl->{Hdr};
 	    $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
-	    $ch =~ s{^parent .*\n}{}m;
+	    $ch =~ s{^parent .*\n}{}mg;
 	    $ch =~ s{(?=^author)}{
 		join '', map { "parent $_\n" } @parents
 	    }me or confess "$ch ?";
@@ -1137,6 +1171,12 @@ sub cmd_record_ffq_prev () {
     }
 }
 
+sub cmd_breakwater () {
+    badusage "no arguments allowed" if @ARGV;
+    my $bw = breakwater_of git_rev_parse 'HEAD';
+    print "$bw\n" or die $!;
+}
+
 sub cmd_stitch () {
     my $prose = '';
     GetOptions('prose=s', \$prose) or die badusage("bad options to stitch");
@@ -1150,19 +1190,28 @@ sub cmd_stitch () {
     if (!$prev) {
 	fail "No ffq-prev to stitch." unless $opt_noop_ok;
     }
-    $prose = ", $prose" if length $prose;
-    runcmd @git, qw(merge -s ours --no-edit -m), <<END;
-Declare fast forward / record previous work
-
-[git-debrebase pseudomerge: stitch$prose]
+    fresh_workarea();
+    my $old_head = get_head();
+    my $new_head = make_commit [ $old_head, $ffq_prev ], [
+	'Declare fast forward / record previous work',
+        "[git-debrebase pseudomerge: stitch$prose]",
+    ];
+    my @upd_cmd = (@git, qw(update-ref --stdin));
+    debugcmd '>|', @upd_cmd;
+    open U, "|-", @upd_cmd or die $!;
+    my $u = <<END;
+update HEAD $new_head $old_head
+delete $ffq_prev $prev
 END
-    # xxx should delete old ffq-prev
-    # xxx should avoid making pseudomerge if not needed
-    # xxx should make pseudomerge in temp tree so can do atomic update
+    printdebug ">= ", $_, "\n" foreach split /\n/, $u;
+    print U $u;
+    printdebug ">\$\n";
+    close U or failedcmd @upd_cmd;
 }
 
-sub cmd_gbp2debrebase () {
-    badusage "needs 1 optional argument, the upstream" unless @ARGV<=1;
+sub cmd_convert_from_gbp () {
+    badusage "needs 1 optional argument, the upstream git rev"
+	unless @ARGV<=1;
     my ($upstream_spec) = @ARGV;
     $upstream_spec //= 'refs/heads/upstream';
     my $upstream = git_rev_parse $upstream_spec;
@@ -1208,9 +1257,9 @@ sub cmd_gbp2debrebase () {
 	runcmd @git, qw(checkout -q gdr-internal~0);
 	rm_subdir_cached 'debian/patches';
 	$work = make_commit ['HEAD'], [
- 'git-debrebase import: drop patch queue',
+ 'git-debrebase convert-from-gbp: drop patches from tree',
  'Delete debian/patches, as part of converting to git-debrebase format.',
- '[git-debrebase: gbp2debrebase, drop patches]'
+ '[git-debrebase convert-from-gbp: drop patches from tree]'
 			      ];
 	# make the breakwater pseudomerge
 	# the tree is already exactly right
@@ -1226,7 +1275,37 @@ sub cmd_gbp2debrebase () {
 	$work = git_rev_parse 'HEAD';
     };
 
-    update_head_checkout $old_head, $work, 'gbp2debrebase';
+    update_head_checkout $old_head, $work, 'convert-from-gbp';
+}
+
+sub cmd_convert_to_gbp () {
+    badusage "no arguments allowed" if @ARGV;
+    my $head = get_head();
+    my $ffq = (ffq_prev_branchinfo())[3];
+    my $bw = breakwater_of $head;
+    fresh_workarea();
+    my $out;
+    in_workarea sub {
+	runcmd @git, qw(checkout -q -b bw), $bw;
+	runcmd @git, qw(checkout -q -b patch-queue/bw), $head;
+	runcmd qw(gbp pq export);
+	runcmd @git, qw(add debian/patches);
+	$out = make_commit ['HEAD'], [
+            'Commit patch queue (converted from git-debrebase format)',
+            '[git-debrebase convert-to-gbp: commit patches]',
+        ];
+    };
+    if (defined $ffq) {
+	runcmd @git, qw(update-ref -m),
+	    "debrebase: converting corresponding main branch to gbp format",
+	    $ffq, $git_null_obj;
+    }
+    update_head_checkout $head, $out, "convert to gbp (v0)";
+    print <<END or die $!;
+git-debrebase: converted to git-buildpackage branch format
+git-debrebase: WARNING: do not now run "git-debrebase" any more
+git-debrebase: WARNING: doing so would drop all upstream patches!
+END
 }
 
 sub cmd_downstream_rebase_launder_v0 () {