X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=98e645a43a9255b81a7821a671b406239c922f90;hp=907ebfeb755e0c3b00613f502266f7e8d154bda2;hb=485a61ef66da7ad675e0495355b1f9f1df952bf5;hpb=fe63aca9ed9d55d546a8cb5cd83053bbaaafe309

diff --git a/git-debrebase b/git-debrebase
index 907ebfeb..98e645a4 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -114,6 +114,7 @@ our $rd;
 our $workarea;
 
 our @git = qw(git);
+our @dgit = qw(dgit);
 
 sub in_workarea ($) {
     my ($sub) = @_;
@@ -595,6 +596,7 @@ sub keycommits ($;$$$$) {
     my ($anchor, $breakwater);
     my $clogonly;
     my $cl;
+    my $found_pm;
     $fatal //= sub { fail $_[1]; };
     my $x = sub {
 	my ($cb, $tagsfx, $mainwhy, $xwhy) = @_;
@@ -634,12 +636,20 @@ sub keycommits ($;$$$$) {
 	    $breakwater = undef;
 	} elsif ($ty eq 'Pseudomerge' or
 		 $ty eq 'AddPatches') {
+	    my $found_pm = 1;
 	    $x->($furniture, (lc $ty),
 		 "found interchange bureaucracy commit ($ty)"," ($head)");
 	} elsif ($ty eq 'DgitImportUnpatched') {
-	    $x->($trouble, 'dgitimport',
-		 "found dgit dsc import ($head)");
-	    return (undef,undef);
+	    if ($found_pm) {
+		$x->($trouble, 'dgitimport',
+		     "found dgit dsc import"," ($head)");
+		return (undef,undef);
+	    } else {
+		$x->($fatal, 'unprocessable',
+		     "found bare dgit dsc import with no prior history",
+		     " ($head)");
+		return (undef,undef);
+	    }
 	} else {
 	    $x->($fatal, 'unprocessable',
 		 "found unprocessable commit, cannot cope: $cl->{Why}",
@@ -701,8 +711,8 @@ sub walk ($;$$) {
 	if ($nogenerate) {
 	    return (undef,undef);
 	}
-	fail "found unprocessable commit, cannot cope:".
-	    (defined $cl->{Why} ? "; $cl->{Why}": '').
+	fail "found unprocessable commit, cannot cope".
+	    (defined $cl->{Why} ? "; $cl->{Why}:": ':').
 	    " (commit $cur) (d.".
 	    (join ' ', map { sprintf "%#x", $_->{Differs} }
 	     @{ $cl->{Parents} }).
@@ -814,13 +824,12 @@ sub walk ($;$$) {
 		next;
 	    } else {
 		# Everything is from this import.  This kind of import
-		# is already in valid breakwater format, with the
-		# patches as commits.
-		printf $report " NoPM" if $report;
-		# last thing we processed will have been the first patch,
-		# if there is one; which is fine, so no need to rewrite
-		# on account of this import
-		$build_start->("ImportOrigin", $cur);
+		# is already nearly in valid breakwater format, with the
+		# patches as commits.  Unfortunately it contains
+		# debian/patches/.
+		printdebug "*** WALK BOMB bare dgit import\n";
+		$cl->{Why} = "bare dgit dsc import";
+		return $bomb->();
 	    }
 	    die "$ty ?";
         } else {
@@ -1184,21 +1193,23 @@ sub do_stitch ($;$) {
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
 
-sub resolve_upstream_version ($$) {
-    my ($new_upstream, $version) = @_;
+sub upstream_commitish_search ($$) {
+    my ($upstream_version, $tried) = @_;
+    # todo: at some point maybe use git-deborig to do this
+    foreach my $tagpfx ('', 'v', 'upstream/') {
+	my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
+	my $new_upstream = git_get_ref "refs/tags/$tag";
+	push @$tried, $tag;
+	return $new_upstream if length $new_upstream;
+    }
+}
 
-    my $new_upstream_version = "$version";
-    $new_upstream_version =~ s/-.*?$//;;
+sub resolve_upstream_version ($$) {
+    my ($new_upstream, $upstream_version) = @_;
 
     if (!defined $new_upstream) {
 	my @tried;
-	# todo: at some point maybe use git-deborig to do this
-	foreach my $tagpfx ('', 'v', 'upstream/') {
-	    my $tag = $tagpfx.(dep14_version_mangle $new_upstream_version);
-	    $new_upstream = git_get_ref "refs/tags/$tag";
-	    last if length $new_upstream;
-	    push @tried, $tag;
-	}
+	$new_upstream = upstream_commitish_search $upstream_version, \@tried;
 	if (!length $new_upstream) {
 	    fail "Could not determine appropriate upstream commitish.\n".
 		" (Tried these tags: @tried)\n".
@@ -1207,7 +1218,7 @@ sub resolve_upstream_version ($$) {
     }
     $new_upstream = git_rev_parse $new_upstream;
 
-    return ($new_upstream, $new_upstream_version);
+    return $new_upstream;
 }
 
 sub cmd_new_upstream () {
@@ -1227,9 +1238,9 @@ sub cmd_new_upstream () {
     }
 
     my $new_upstream = shift @ARGV;
-    my $new_upstream_version;
-    ($new_upstream, $new_upstream_version) =
-	resolve_upstream_version $new_upstream, $new_version;
+    my $new_upstream_version = upstreamversion  $new_version;
+    $new_upstream =
+	resolve_upstream_version $new_upstream, $new_upstream_version;
 
     record_ffq_auto();
 
@@ -1636,8 +1647,9 @@ sub cmd_convert_from_gbp () {
 
     my ($upstream_spec) = @ARGV;
 
-    my ($upstream, $upstream_version) =
-	resolve_upstream_version($upstream_spec, $version);
+    my $upstream_version = upstreamversion $version;
+    my $upstream =
+	resolve_upstream_version($upstream_spec, $upstream_version);
 
     my $old_head = get_head();
 
@@ -1776,6 +1788,194 @@ git-debrebase: WARNING: doing so would drop all upstream patches!
 END
 }
 
+sub cmd_convert_from_dgit_view () { 
+    my $clogp = parsechangelog();
+
+    my $bpd = (cfg 'dgit.default.build-products-dir',1) // '..';
+    my $do_origs = 1;
+    my $do_tags = 1;
+    my $always = 0;
+    my $diagnose = 0;
+
+    getoptions("convert-from-dgit-view",
+	       'diagnose!', \$diagnose,
+	       'build-products-dir:s', \$bpd,
+	       'origs!', \$do_origs,
+	       'tags!', \$do_tags,
+	       'always-convert-anyway!', \$always);
+    fail "takes 1 optional argument, the upstream commitish" if @ARGV>1;
+
+    my @upstreams;
+
+    if (@ARGV) {
+	my $spec = shift @ARGV;
+	my $commit = git_rev_parse "$spec^{commit}";
+	push @upstreams, { Commit => $commit,
+			   Source => "$ARGV[0], from command line",
+			   Only => 1,
+			 };
+    }
+
+    my $head = get_head();
+
+    if (!$always) {
+	my $troubles = 0;
+	my $trouble = sub { $troubles++; };
+	keycommits $head, sub{}, sub{}, $trouble, $trouble;
+	printdebug "troubles=$troubles\n";
+	if (!$troubles) {
+	    print STDERR <<END;
+$us: Branch already seems to be in git-debrebase format!
+$us: --always-convert-anyway would do the conversion operation anyway
+$us: but is probably a bad idea.  Probably, you wanted to do nothing.
+END
+	    fail "Branch already in git-debrebase format." unless $opt_noop_ok;
+	    finish 0;
+	}
+    }
+
+    snags_maybe_bail_early();
+
+    my $version = upstreamversion $clogp->{Version};
+    print STDERR "Considering possible commits corresponding to upstream:\n";
+
+    if (!@upstreams) {
+	if ($do_tags) {
+	    my @tried;
+	    my $ups_tag = upstream_commitish_search $version, \@tried;
+	    if ($ups_tag) {
+		my $this = "git tag $tried[-1]";
+		push @upstreams, { Commit => $ups_tag,
+				   Source => $this,
+				 };
+	    } else {
+		printf STDERR
+		    " git tag: no suitable tag found (tried %s)\n",
+		    "@tried";
+	    }
+	}
+	if ($do_origs) {
+	    my $p = $clogp->{'Source'};
+	    # we do a quick check to see if there are plausible origs
+	    my $something=0;
+	    if (!opendir BPD, $bpd) {
+		die "$bpd: opendir: $!" unless $!==ENOENT;
+	    } else {
+		while ($!=0, my $f = readdir BPD) {
+		    next unless is_orig_file_of_p_v $f, $p, $version;
+		    printf STDERR
+			" orig: found what looks like a .orig, %s\n",
+			"$bpd/$f";
+		    $something=1;
+		    last;
+		}
+		die "read $bpd: $!" if $!;
+		closedir BPD;
+	    }
+	    if ($something) {
+		my $tree = cmdoutput
+		    @dgit, qw(--build-products-dir), $bpd,
+		    qw(print-unapplied-treeish);
+		fresh_workarea();
+		in_workarea sub {
+		    runcmd @git, qw(reset --quiet), $tree, qw(-- .);
+		    rm_subdir_cached 'debian';
+		    $tree = cmdoutput @git, qw(write-tree);
+		    my $ups_synth = make_commit [], [ <<END, <<END,
+Import effective orig tree for upstream version $version
+END
+This includes the contents of the .orig(s), minus any debian/ directory.
+
+[git-debrebase import-from-dgit-view upstream-import-convert: $version]
+END
+						    ];
+		    push @upstreams, { Commit => $ups_synth,
+				       Source => "orig(s) imported via dgit",
+				     };
+		}
+	    } else {
+		printf STDERR
+		    " orig: no suitable origs found (looked for %s in %s)\n",
+		    "${p}_".(stripeoch $version)."...", $bpd;
+	    }
+	}
+    }
+
+    my $some_patches = stat_exists 'debian/patches/series';
+
+    print STDERR "Evaluating possible commits corresponding to upstream:\n";
+
+    my $result;
+    foreach my $u (@upstreams) {
+	my $work = $head;
+	fresh_workarea();
+	in_workarea sub {
+	    runcmd @git, qw(reset --quiet), $u->{Commit}, qw(-- .);
+	    runcmd @git, qw(checkout), $u->{Commit}, qw(-- .);
+	    runcmd @git, qw(clean -xdff);
+	    runcmd @git, qw(checkout), $head, qw(-- debian);
+	    if ($some_patches) {
+		rm_subdir_cached 'debian/patches';
+		$work = make_commit [ $work ], [
+ 'git-debrebase convert-from-dgit-view: drop upstream changes from breakwater',
+ "Drop upstream changes, and delete debian/patches, as part of converting\n".
+ "to git-debrebase format.  Upstream changes will appear as commits.",
+ '[git-debrebase convert-from-dgit-view: drop patches from tree]'
+					   ];
+	    }
+	    $work = make_commit [ $work, $u->{Commit} ], [
+ 'git-debrebase convert-from-dgit-view: declare upstream',
+ '(Re)constructed breakwater merge.',
+ '[git-debrebase anchor: declare upstream]'
+							 ];
+	    runcmd @git, qw(checkout --quiet -b mk), $work;
+	    if ($some_patches) {
+		runcmd @git, qw(checkout), $head, qw(-- debian/patches);
+		runcmd @git, qw(reset --quiet);
+		my @gbp_cmd = (qw(gbp pq import));
+		if (!$diagnose) {
+		    my $gbp_err = "../gbp-pq-err";
+		    @gbp_cmd = shell_cmd "exec >$gbp_err 2>&1", @gbp_cmd;
+		}
+		my $r = system @gbp_cmd;
+		if ($r) {
+		    printf STDERR
+			" %s: couldn't apply patches: gbp pq %s",
+			$u->{Source}, waitstatusmsg();
+		    return;
+		}
+	    }
+	    my $work = git_rev_parse qw(HEAD);
+	    my $diffout = cmdoutput @git, qw(diff-tree --stat HEAD), $work;
+	    if (length $diffout) {
+		print STDERR
+		    " $u->{Source}: applying patches gives different tree\n";
+		print STDERR $diffout if $diagnose;
+		return;
+	    }
+	    # OMG!
+	    $u->{Result} = $work;
+	    $result = $u;
+	};
+	last if $result;
+    }
+
+    if (!$result) {
+	fail <<END;
+Could not find or construct a suitable upstream commit.
+Rerun adding --diagnose after convert-from-dgit-view, or pass a
+upstream commmit explicitly or provide suitable origs.
+END
+    }
+
+    printf STDERR "Yes, will base new branch on %s\n", $result->{Source};
+
+    ffq_check $result->{Result};
+    snags_maybe_bail();
+    update_head_checkout $head, $result->{Result},
+	'convert-from-dgit-view';
+}
+
 sub cmd_downstream_rebase_launder_v0 () {
     badusage "needs 1 argument, the baseline" unless @ARGV==1;
     my ($base) = @ARGV;
@@ -1831,6 +2031,7 @@ getoptions_main
 	   'noop-ok', => \$opt_noop_ok,
 	   'f=s' => \@snag_force_opts,
 	   'anchor=s' => \@opt_anchors,
+	   '--dgit=s' => \($dgit[0]),
 	   'force!',
 	   '-i:s' => sub {
 	       my ($opt,$val) = @_;