use POSIX;
use Data::Dumper;
use Getopt::Long qw(:config posix_default gnu_compat bundling);
+use Dpkg::Version;
our ($opt_force);
memoize('cfg');
+sub dd ($) {
+ my ($v) = @_;
+ my $dd = new Data::Dumper [ $v ];
+ Terse $dd 1; Indent $dd 0; Useqq $dd 1;
+ return Dump $dd;
+}
+
sub get_commit ($) {
my ($objid) = @_;
my $data = git_cat_file $objid, 'commit';
sub read_tree_subdir ($$) {
my ($subdir, $new_tree_object) = @_;
rm_subdir_cached $subdir;
- runcmd @git, qw(read-tree), "--prefix=$subdir/";
+ runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object;
}
# classify returns an info hash like this
foreach my $ph (@ph) {
push @$p_ref, {
- Ix => $#$p_ref,
+ Ix => scalar @$p_ref,
CommitId => $ph,
};
}
my $t = $r->{Tree};
foreach my $p (@p) {
- $p->{Differs} => (get_differs $p->{CommitId}, $t),
+ $p->{Differs} = (get_differs $p->{CommitId}, $t),
}
printdebug "classify $objid \$t=$t \@p",
my ($type, @rest) = @_;
$r = { %$r, Type => $type, @rest };
if ($debuglevel) {
- my $dd = new Data::Dumper [ $r ];
- Terse $dd 1; Indent $dd 0; Useqq $dd 1;
- printdebug " = $type ".(Dump $dd)."\n";
+ printdebug " = $type ".(dd $r)."\n";
}
return $r;
};
} elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
return $unknown->("edits debian/patches");
} elsif ($d & DS_DEB and !($d & ~DS_DEB)) {
- my ($ty,$dummy) = git_cat_file "$ph[0]:debian";
+ my ($ty,$dummy) = git_cat_file "$p[0]{CommitId}:debian";
if ($ty eq 'tree') {
if ($d == D_DEB_CLOG) {
return $classify->(qw(Changelog));
if (@p == 2 &&
!$haspatches &&
!$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin
- !($p[$prevbrw]{Differs} & ~DS_DEB) &&
- !($p[!$prevbrw]{Differs} & ~D_UPS)) {
+ !($p[!$prevbrw]{Differs} & ~DS_DEB) && # no non-debian changess
+ !($p[$prevbrw]{Differs} & ~D_UPS)) { # no non-upstream changes
return $classify->(qw(BreakwaterUpstreamMerge),
OrigParents => [ $p[!$prevbrw] ]);
}
sub walk ($;$$) {
my ($input,
$nogenerate,$report) = @_;
- # => ($tip, $breakwater_tip)
+ # => ($tip, $breakwater_tip, $last_upstream_merge_in_breakwater)
# (or nothing, if $nogenerate)
+ printdebug "*** WALK $input ".($nogenerate//0)." ".($report//'-')."\n";
+
# go through commits backwards
# we generate two lists of commits to apply:
# breakwater branch and upstream patches
no warnings qw(exiting); last;
};
+ my $last_upstream_update;
+
for (;;) {
$cl = classify $cur;
my $ty = $cl->{Type};
$cur = $p0;
next;
} elsif ($ty eq 'BreakwaterStart') {
+ $last_upstream_update = $cur;
$build_start->('FirstPackaging', $cur);
} elsif ($ty eq 'Upstream') {
push @upp_cl, $cl;
$cur = $contrib;
next;
} elsif ($ty eq 'BreakwaterUpstreamMerge') {
+ $last_upstream_update = $cur;
$build_start->("PreviousBreakwater", $cur);
} elsif ($ty eq 'DgitImportUnpatched') {
my $pm = $pseudomerges[-1];
printf $report " PM=%s \@Overwr:%d", $pm, (scalar @$ovwrs)
if $report;
if (@$ovwrs != 1) {
+ printdebug "*** WALK BOMB DgitImportUnpatched\n";
return $bomb->();
}
my $ovwr = $ovwrs->[0]{CommitId};
$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 {
}
die "$ty ?";
} else {
+ printdebug "*** WALK BOMB unrecognised\n";
return $bomb->();
}
}
$prprdelim->();
+
+ printdebug "*** WALK prep done cur=$cur".
+ " brw $#brw_cl upp $#upp_cl proc $#processed pm $#pseudomerges\n";
+
return if $nogenerate;
# Now we build it back up again
my $read_tree_debian = sub {
my ($treeish) = @_;
read_tree_subdir 'debian', "$treeish:debian";
+ rm_subdir_cached 'debian/patches';
};
my $read_tree_upstream = sub {
my ($treeish) = @_;
my $newcommit = cmdoutput @cmd;
confess "$ch ?" unless $rewriting or $newcommit eq $cl->{CommitId};
$build = $newcommit;
+ if (grep { $method eq $_ } qw(DgitImportUpstreamUpdate)) {
+ $last_upstream_update = $cur;
+ }
}
};
die sprintf "internal error %#x %s %s", $final_check, $build, $input
if $final_check & ~D_PAT_ADD;
- return ($build, $breakwater);
+ my @r = ($build, $breakwater, $last_upstream_update);
+ printdebug "*** WALK RETURN @r\n";
+ return @r
}
sub get_head () { return git_rev_parse qw(HEAD); }
sub cmd_launder () {
badusage "no arguments to launder allowed" if @ARGV;
my $old = get_head();
- my ($tip,$breakwater) = walk $old;
+ my ($tip,$breakwater,$last_upstream_merge) = walk $old;
update_head $old, $tip, 'launder';
# no tree changes except debian/patches
runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
printf "# breakwater tip\n%s\n", $breakwater;
printf "# working tip\n%s\n", $tip;
+ printf "# last upstream merge\n%s\n", $last_upstream_merge;
}
sub cmd_analyse () {
}
sub cmd_new_upstream_v0 () {
+ # xxx would like to support more git-rebase options
badusage
"need NEW-VERSION UPS-COMMITISH [EXTRA-UPS-NAME EXTRA-UPS-COMMITISH...]"
unless @ARGV % 2 == 0 and @ARGV >= 2;
my %pieces;
# parse args - low commitment
- my $new_version = (new Dpkg::Version scalar(shift @ARGV), 1);
+ my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1);
my $new_upstream_version = $new_version->version();
my $new_upstream = git_rev_parse shift @ARGV;
my @newpieces;
my $newpiece = sub {
my ($n, @x) = @_; # may be ''
- $pc = $piece->($n, @x, NewIx => (scalar @newpieces));
+ my $pc = $piece->($n, @x, NewIx => (scalar @newpieces));
push @newpieces, $pc;
};
$newpiece->('',
OldIx => 0,
New => $new_upstream,
- };
+ );
while (@ARGV) {
my $n = shift @ARGV;
my $c = git_rev_parse shift @ARGV;
# now we need to investigate the branch this generates the
# laundered version but we don't switch to it yet
- my $old = get_head();
- my ($laundered_tip,$breakwater) = walk $old;
+ my $old_head = get_head();
+ my ($old_laundered_tip,$old_bw,$old_upstream_update) = walk $old_head;
- my $breakwater_cl = classify $breakwater;
- my $old_orig = parsecommit $breakwater_cl->{OrigParents}[0]{CommitId};
+ my $old_bw_cl = classify $old_bw;
+ my $old_upstream_update_cl = classify $old_upstream_update;
+ confess unless $old_upstream_update_cl->{OrigParents};
+ my $old_upstream = parsecommit
+ $old_upstream_update_cl->{OrigParents}[0]{CommitId};
my $problems = 0;
my $problem = sub {
print STDERR "preflight check failed: $msg\n";
};
- $piece->('', Old => $old_orig);
+ $piece->('', Old => $old_upstream->{CommitId});
- if ($old_orig_ci =~ m{^\[git-debrebase }m) {
- if ($old_orig_ci =~
+ if ($old_upstream->{Msg} =~ m{^\[git-debrebase }m) {
+ if ($old_upstream->{Msg} =~
m{^\[git-debrebase new-upstream combine \.((?: $extra_orig_namepart_re)+)\]}
) {
my @oldpieces = ('', split / /, $1);
- my $parentix = -1 + scalar @{ $old_orig->{Parents} };
- foreach my $i (0..$#$oldpieces) {
+ my $parentix = -1 + scalar @{ $old_upstream->{Parents} };
+ foreach my $i (0..$#oldpieces) {
my $n = $oldpieces[$i];
- $piece->($n, Old => $old_orig.'^'.$parentix);
+ $piece->($n, Old => $old_upstream->{CommitId}.'^'.$parentix);
}
} else {
- $problem->("previous upstream $old_orig->{CommitId} is from".
+ $problem->("previous upstream $old_upstream->{CommitId} is from".
" git-debrebase but not a \`new-upstream combine' commit");
}
}
}
}
+ my $new_bw;
+
fresh_workarea();
in_workarea sub {
my @upstream_merge_parents;
if (!$problems) {
- push @upstream_merge_parents, $old_orig->{CommitId};
+ push @upstream_merge_parents, $old_upstream->{CommitId};
}
foreach my $pc (@newpieces) { # always has '' first
if ($pc->{Name}) {
- read_tree_subdir $pcname, $pc->{New];
+ read_tree_subdir $pc->{Name}, $pc->{New};
} else {
runcmd @git, qw(read-tree), $pc->{New};
}
# combined commit we just made. Either way it will be the
# "upstream" parent of the breakwater special merge.
- read_tree_subdir 'debian', "$breakwater:debian";
+ read_tree_subdir 'debian', "$old_bw:debian";
# index now contains the breakwater merge contents
my $bw_tree = cmdoutput @git, qw(write_tree);
my @cmd = (@git, qw(commit-tree), $bw_tree);
- push @cmd, qw(-p), $breakwater, qw(-p), $new_upstream;
+ push @cmd, qw(-p), $old_bw, qw(-p), $new_upstream;
push @cmd, qw(-m), "Update to upstream $new_upstream_version";
push @cmd, qw(-m),
"[git-debrebase new-upstream breakwater $new_upstream_version]";
- my $new_bw = cmdoutput @git;
+ $new_bw = cmdoutput @git;
# Now we have to add a changelog stanza so the Debian version
# is right.
$oldclog =~ m/^($package_re) \(\S+\) / or
fail "cannot parse old changelog to get package name";
my $p = $1;
- print CN, <<END, $oldclog or die $!;
+ print CN <<END, $oldclog or die $!;
$p ($new_version) UNRELEASED; urgency=medium
* Update to new upstream version $new_upstream_version.
push @cmd, qw(-m),
"[git-debrebase new-upstream changelog $new_upstream_version]";
$new_bw = cmdoutput @git;
-
+ };
- update_head
- xxx check new orig version is reasonable;
- xxx decorate new orig version to get new debian version;
-
+ # we have constructed the new breakwater. we now need to commit to
+ # the laundering output, because git-rebase can't easily be made
+ # to make a replay list which is based on some other branch
+
+ update_head $old_head, $old_laundered_tip, 'launder for new upstream';
+
+ my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw);
+ runcmd @cmd;
+ # now it's for the user to sort out
+}
sub cmd_downstream_rebase_launder_v0 () {
badusage "needs 1 argument, the baseline" unless @ARGV==1;
~ianmdlvl / dgit.git / blobdiff