X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=7b2e4f311dfbdf64813d14cb2bac92184837a6ff;hb=9cda023c0c49449a1d5862483df8d785e062765b;hp=fb6b79d92a905239f88b8bdeb0dd9c8c1a7f9424;hpb=bcc6b2b9ee152cbb679642117ee191a383d359b0;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index fb6b79d9..7b2e4f31 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1623,6 +1623,41 @@ sub cmd_convert_from_gbp () {
 	    "upstream ($upstream) contains debian/ directory";
     }
 
+    my $previous_dgit_view = eval {
+	my @clogcmd = qw(dpkg-parsechangelog --format rfc822 -n2);
+	my ($lvsn, $suite);
+	parsechangelog_loop \@clogcmd, 'debian/changelog', sub {
+	    my ($stz, $desc) = @_;
+	    no warnings qw(exiting);
+	    printdebug 'CHANGELOG ', Dumper($desc, $stz);
+	    next unless $stz->{Date};
+	    next unless $stz->{Distribution} ne 'UNRELEASED';
+	    $lvsn = $stz->{Version};
+	    $suite = $stz->{Distribution};
+	    last;
+	};
+	die "neither of the first two changelog entries are released\n"
+	    unless defined $lvsn;
+	print "last finished-looking changelog entry: ($lvsn) $suite\n";
+	my $mtag_pat = debiantag_maintview $lvsn, '*';
+	my $mtag = cmdoutput @git, qw(describe --always --abbrev=0 --match),
+	    $mtag_pat;
+	die "could not find suitable maintainer view tag $mtag_pat\n"
+	    unless $mtag_pat =~ m{/};
+	is_fast_fwd $mtag, 'HEAD' or
+	    die "HEAD is not FF from maintainer tag $mtag!";
+	my $dtag = "archive/$mtag";
+	is_fast_fwd $mtag, $dtag or
+	    die "dgit view tag $dtag is not FF from maintainer tag $mtag";
+	print "will stitch in dgit view, $dtag\n";
+	git_rev_parse $dtag;
+    };
+    if (!$previous_dgit_view) {
+	$@ =~ s/^\n+//;
+	chomp $@;
+	print STDERR "cannot stitch in dgit view: $@\n";
+    }
+
     snags_maybe_bail();
 
     my $work;
@@ -1652,6 +1687,13 @@ sub cmd_convert_from_gbp () {
 	runcmd @git, qw(reset --quiet --hard patch-queue/gdr-internal);
 	runcmd @git, qw(rebase --quiet --onto), $work, qw(gdr-internal);
 	$work = git_rev_parse 'HEAD';
+
+	if ($previous_dgit_view) {
+	    $work = make_commit [$work, $previous_dgit_view], [
+ 'git-debrebase import: declare ff from dgit archive view',
+ '[git-debrebase pseudomerge: import-from-gbp]',
+            ];
+	}
     };
 
     update_head_checkout $old_head, $work, 'convert-from-gbp';