chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f2c6ef6
)
git-debrebase: sort out report, and walk, allegedly
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 28 Apr 2017 17:47:41 +0000
(18:47 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index e2a1a325ed3bb02fa978483f4965bd0610a8710a..d9bc9432cd423bc7ffcce120780aa750539cc7fb 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-300,9
+300,10
@@
sub classify ($) {
return $unknown->("complex merge");
}
return $unknown->("complex merge");
}
-sub walk ($$;$$$) {
- my ($input, $wantdebonly,
- $report, $depth, $report_anomaly, $report_only) = @_;
+sub walk ($;$$$$) {
+ my ($input,
+ $nogenerate,$report,
+ $wantdebonly,$depth) = @_;
# go through commits backwards
# we generate two lists of commits to apply
# => ($tip, $breakwater_tip)
# go through commits backwards
# we generate two lists of commits to apply
# => ($tip, $breakwater_tip)
@@
-310,11
+311,6
@@
sub walk ($$;$$$) {
my %found;
my @pseudomerges;
my %found;
my @pseudomerges;
- $report //= sub { };
- $report_anomaly //= sub {
- my ($cl, $msg) = @_;
- die "commit $cl: $msg\n";
- };
$depth //= 0;
my $cl;
$depth //= 0;
my $cl;
@@
-331,11
+327,17
@@
sub walk ($$;$$$) {
my $cur = $input;
my $cur = $input;
+ my $prdelim = "";
+ my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; }
+
for (;;) {
$cl = classify $cur;
my $ty = $cl->{Type};
my $st = $cl->{SubType};
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};
$found{$ty. ( defined($st) ? "-$st" : '' )}++;
push @processed, $cl;
my $p0 = $cl->{Parents}[0]{CommitId};
@@
-362,6
+364,7
@@
sub walk ($$;$$$) {
$rewrite_from_here->();
next;
} elsif ($ty eq 'Pseudomerge') {
$rewrite_from_here->();
next;
} elsif ($ty eq 'Pseudomerge') {
+ print $report " Contributor=$ty->{Contributor}" if $report;
push @pseudomerges, $cl;
$rewrite_from_here->();
$cur = $ty->{Contributor};
push @pseudomerges, $cl;
$rewrite_from_here->();
$cur = $ty->{Contributor};
@@
-382,7
+385,9
@@
sub walk ($$;$$$) {
# 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};
# 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) {
if ($differs & D_UPS) {
+ printf $report " D_UPS" if $report;
push @deb_cl, {
%r,
SpecialMethod => 'DgitImportUpstreamUpdate',
push @deb_cl, {
%r,
SpecialMethod => 'DgitImportUpstreamUpdate',
@@
-394,20
+399,29
@@
sub walk ($$;$$$) {
SpecialMethod => 'DgitImportDebianUpdate',
$xmsg->("convert dgit import: upstream changes")
};
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 {
$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);
}
if ($nogenerate) {
return (undef, $basis);
}
+ # Now we build it back up again
+
workarea_fresh();
my $rewriting = 0;
workarea_fresh();
my $rewriting = 0;
@@
-503,16
+517,28
@@
sub update_head ($$) {
runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
}
runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
}
-sub cmd_analyse () {
-
-
sub cmd_launder () {
sub cmd_launder () {
+ badusage "no arguments to launder allowed";
my $old = get_head();
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);
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);
}
my $toplevel = runcmd @git, qw(rev-parse --show-toplevel);