# - no fast forward checks
# for now only explicit with commitids
- # implicitly uses `upstream'
+# implicitly uses `upstream'
# # (or multiple other branches)
# git-debrebase new-upstream \
# [<subdir>/]=<commitid>
# refs/ffqrebase-prev/BRANCH BRANCH may be refs/...; if not it means
# refs/ffqrebase-base/BRANCH refs/heads/BRANCH
# zero, one, or both of these may exist
+#
+# git-debrebase without start, if already started, is willing
+# to strip pseudomerges provided that they overwrite exactly
+# the previous HEAD
+# xxxx is this right ? what matters is have we pushed
+# I think in fact the right answer is:
+# git-debrebase always strips out pseudomerges from its branch
+# a pseudomerge is put in at the time we want to push
+# at that time, we make a pseudomerge of the remote tracking
+# branch (if raw git) or the dgit view (if dgit)
+# for raw git git-ffqrebase, do want preciseley to record
+# value of remote tracking branch or our branch, on start, so we
+# overwrite only things we intend to
+# the previous pseudomerge check for tags and remote branches ?
use strict;
use Memoize;
+use Carp;
use Data::Dumper;
use Debian::Dgit qw(:DEFAULT $wa);
our $rd = ".git/git-debrebase";
our $ud = "$rd/work";
+our @git = qw(git);
sub commit_pr_info ($) {
my ($r) = @_;
sub calculate_committer_authline () {
my $c = cmdoutput @git, qw(commit-tree --no-gpg-sign -m),
- 'DUMMY COMMIT (git-debrebase)', "$basis:";
+ 'DUMMY COMMIT (git-debrebase)', "HEAD:";
my ($h,$m) = get_commit $c;
$h =~ m/^committer .*$/m or confess "($h) ?";
return $&;
my ($h,$m) = get_commit $objid;
- my ($t) = $h =~ m/^tree (\w+)$/m or die $cur;
+ my ($t) = $h =~ m/^tree (\w+)$/m or die $objid;
my (@ph) = $h =~ m/^parent (\w+)$/m;
my @p;
my $r = {
CommitId => $objid,
- Hdr => $hdr,
+ Hdr => $h,
Msg => $m,
Tree => $t,
Parents => \@p,
my $classify = sub {
my ($type, @rest) = @_;
- $r = { %r, Type => $type, @rest };
+ $r = { %$r, Type => $type, @rest };
return $r;
};
my $unknown = sub {
my ($why) = @_;
- $r = { %r, Type => Unknown };
+ $r = { %$r, Type => qw(Unknown) };
return $r;
- }
+ };
if (@p == 1) {
my $d = $r->{Parents}[0]{Differs};
- if ($d == D_DPAT_ADD) {
+ if ($d == D_PAT_ADD) {
return $classify->(qw(AddPatches));
- } elsif ($d & (D_DPAT_ADD|D_DPAT_OTH)) {
+ } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
return $unknown->("edits debian/patches");
} elsif ($d == D_DEB) {
return $classify->(qw(Packaging));
} elsif ($d == D_UPS) {
return $classify->(qw(Upstream));
- } elsif ($d == D_DEB|D_UPS) {
+ } elsif ($d == (D_DEB|D_UPS)) {
return $classify->(qw(Mixed));
} elsif ($d == 0) {
return $unknown->("no changes");
SubType => qw(Ambiguous),
Overwritten => $bytime[0],
Contributor => $bytime[1]);
- }!
+ }
foreach my $p (@p) {
my ($p_h, $p_m) = get_commit $p;
$p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
}
- my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' };
+ my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' } @p;
my $m2 = $m;
if (!(grep { !$_->{IsOrigin} } @p) and
- (@origs >= @p - 1) and
+ (@orig_ps >= @p - 1) and
$m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) {
$r->{NewMsg} = $m2;
return $classify->(qw(DgitImportUnpatched),
return $unknown->("complex merge");
}
-sub walk ($$$;$$$) {
- my ($input, $pseudos_must_overwrite_this, $wantdebonly,
- $report, $depth, $report_anomaly, $nogenerate) = @_;
+sub walk ($;$$$$);
+sub walk {
+ my ($input,
+ $nogenerate,$report,
+ $wantdebonly,$depth) = @_;
# go through commits backwards
# we generate two lists of commits to apply
# => ($tip, $breakwater_tip)
my %found;
my @pseudomerges;
- $report //= sub { };
- $report_anomaly //= sub {
- my ($cl, $msg) = @_;
- die "commit $cl: $msg\n";
- };
$depth //= 0;
my $cl;
};
my $cur = $input;
+ my $basis;
+
+ my $prdelim = "";
+ my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; };
for (;;) {
$cl = classify $cur;
my $ty = $cl->{Type};
my $st = $cl->{SubType};
- $report->($cl);
+ if ($report) {
+ print $report $prdelim, "$cl->{CommitId} $cl->{Type}";
+ $prdelim = "\n";
+ }
$found{$ty. ( defined($st) ? "-$st" : '' )}++;
+ push @processed, $cl;
my $p0 = $cl->{Parents}[0]{CommitId};
if ($ty eq 'AddPatches') {
$cur = $p0;
next;
} elsif ($ty eq 'Packaging') {
push @deb_cl, $cl;
- push @processed, $cl;
$cur = $p0;
next;
} elsif ($ty eq 'Upstream') {
push @ups_cl, $cl;
- push @processed, $cl;
$cur = $p0;
next;
} elsif ($ty eq 'Mixed') {
$rewrite_from_here->();
next;
} elsif ($ty eq 'Pseudomerge') {
- if (defined $pseudos_must_overwrite_this &&
- !grep {
- is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
- },
- @{ $cl->{Overwritten} }) {
- $report_anomaly->($cl,
- "Pseudomerge should overwrite".
- " $pseudos_must_overwrite_this".
- " but does not do so");
- }
+ print $report " Contributor=$ty->{Contributor}" if $report;
push @pseudomerges, $cl;
$rewrite_from_here->();
$cur = $ty->{Contributor};
# of a new upstream version. We can tell these apart
# by looking at the tree of the supposed upstream.
my $differs = get_differs $previous_breakwater, $cl->{Tree};
+ printf $report " Differs=%#x", $differs if $report;
if ($differs & D_UPS) {
+ printf $report " D_UPS" if $report;
push @deb_cl, {
%r,
SpecialMethod => 'DgitImportUpstreamUpdate',
SpecialMethod => 'DgitImportDebianUpdate',
$xmsg->("convert dgit import: upstream changes")
};
- $basis = launder $pseudomerges[0]{Overwritten}, undef, 1,
- $report, $depth+1, $nogenerate;
+ $prprdelim->();
+ $basis = walk
+ $pseudomerges[0]{Overwritten},
+ $nogenerate, $report,
+ 1, $depth+1;
$rewrite_from_here->();
last;
} else {
- $report_anomaly->($cl, "Cannot cope with this commit");
+ print $report " Unprocessable" if $report;
+ $prprdelim->();
+ if ($nogenerate) {
+ return (undef,undef);
+ }
+ die "commit $cur: Cannot cope with this commit";
}
}
- # Now we build it back up again
-
+ $prprdelim->();
if ($nogenerate) {
return (undef, $basis);
}
+ # Now we build it back up again
+
workarea_fresh();
- my $rewriting = 1;
+ my $rewriting = 0;
my $build = $basis;
runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
}
-sub cmd_analyse () {
-
-
sub cmd_launder () {
+ badusage "no arguments to launder allowed";
my $old = get_head();
- my ($tip,$breakwater) = launder $old, 0, undef, 0;
+ my ($tip,$breakwater) = walk $old;
update_head $old, $tip, 'launder';
# no tree changes except debian/patches
runcmd @git, qw(rm --quiet -rf debian/patches);
- printf "# breakwater tip:\n%s\n", $breakwater;
+ printf "# breakwater tip\n%s\n", $breakwater;
+}
+
+sub cmd_analyse () {
+ die if ($ARGV[0]//'') =~ m/^-/;
+ badusage "too many arguments to analyse" if @ARGV>1;
+ my ($old) = @ARGV;
+ if (defined $old) {
+ $old = git_rev_parse $old;
+ } else {
+ $old = get_head();
+ }
+ my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
+ print "$breakwater BREAKWATER\n";
+ STDOUT->error and die $!;
}
my $toplevel = runcmd @git, qw(rev-parse --show-toplevel);
~ianmdlvl / dgit.git / blobdiff