use POSIX;
use Data::Dumper;
use Getopt::Long qw(:config posix_default gnu_compat bundling);
+use Dpkg::Version;
our ($opt_force);
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",
} 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));
}
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) = 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 = parsecommit $old_bw_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);
- 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;
-
+ };
+
+ # 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
- xxx check new orig version is reasonable;
- xxx decorate new orig version to get new debian version;
-
+ 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