X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=cc51f775889c2e987e7c0f209721fc8d4b7f1fe4;hp=8253cb7a17aec5cdfa9e964e7b705b808a5747f2;hb=3991eff63504d351b858d3a84392dbb03245946c;hpb=4caaec322319aafb5886a2ad2fb5abd53181d92a

diff --git a/git-debrebase b/git-debrebase
index 8253cb7a..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;
     };
@@ -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,
@@ -1131,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");
@@ -1163,8 +1209,9 @@ END
     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;
@@ -1210,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
@@ -1228,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 () {