X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=28d96ec583af6bf41e76e3ae03355dc5a979b98b;hb=22c4f9bd68ac3cfc6a88fe4b4baf0a3ffda0a8b2;hp=10dadc55cab4f731768601f65e47a409ff132e69;hpb=11427376f5f4fef68225cebebda04f78faad5b01;p=dgit.git diff --git a/git-debrebase b/git-debrebase index 10dadc55..28d96ec5 100755 --- a/git-debrebase +++ b/git-debrebase @@ -21,6 +21,7 @@ END { $? = $Debian::Dgit::ExitStatus::desired // -1; }; use Debian::Dgit::GDR; use Debian::Dgit::ExitStatus; +use Debian::Dgit::I18n; use strict; @@ -30,6 +31,7 @@ setup_sigwarn(); use Memoize; use Carp; use POSIX; +use Locale::gettext; use Data::Dumper; use Getopt::Long qw(:config posix_default gnu_compat bundling); use Dpkg::Version; @@ -38,7 +40,7 @@ use File::Copy; $debugcmd_when_debuglevel = 2; -our ($usage_message) = <<'END'; +our ($usage_message) = i_ <<'END'; usages: git-debrebase [] [--|-i ] git-debrebase [] status @@ -62,7 +64,7 @@ $|=1; sub badusage ($) { my ($m) = @_; - print STDERR "$us: bad usage: $m\n"; + print STDERR f_ "%s: bad usage: %s\n", $us, $m; finish 8; } @@ -73,7 +75,7 @@ sub getoptions_main { } sub getoptions { my $sc = shift; - getoptions_main "bad options follow \`git-debrebase $sc'", @_; + getoptions_main +(f_ "bad options follow \`git-debrebase %s'", $sc), @_; } sub cfg ($;$) { @@ -84,7 +86,7 @@ sub cfg ($;$) { push @cmd, $k; my $out = cmdoutput_errok @cmd; if (!defined $out) { - fail "missing required git config $k" unless $optional; + fail f_ "missing required git config %s", $k unless $optional; return (); } my @l = split /\0/, $out; @@ -103,7 +105,7 @@ sub dd ($) { sub get_commit ($) { my ($objid) = @_; my $data = (git_cat_file $objid, 'commit'); - $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?"; + $data =~ m/(?<=\n)\n/ or confess "$objid ($data) ?"; return ($`,$'); } @@ -142,10 +144,10 @@ sub run_ref_updates_now ($$) { my @upd_cmd = (git_update_ref_cmd "debrebase: $mrest", qw(--stdin)); debugcmd '>|', @upd_cmd; - open U, "|-", @upd_cmd or die $!; + open U, "|-", @upd_cmd or confess $!; foreach (@$updates) { printdebug ">= ", $_, "\n"; - print U $_, "\n" or die $!; + print U $_, "\n" or confess $!; } printdebug ">\$\n"; close U or failedcmd @upd_cmd; @@ -171,7 +173,8 @@ sub all_snags_summarised () { sub run_deferred_updates ($) { my ($mrest) = @_; - confess 'dangerous internal error' unless all_snags_summarised(); + my $m = 'dangerous internal error'; + confess $m.' - '.__ $m unless all_snags_summarised(); merge_wreckage_cleaning \@deferred_updates; run_ref_updates_now $mrest, \@deferred_updates; @@ -395,10 +398,10 @@ sub snag ($$;@) { my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits if (grep { $_ eq $tag } @snag_force_opts) { $snags_forced++; - print STDERR "git-debrebase: snag ignored (-f$tag): $msg\n"; + print STDERR f_ "%s: snag ignored (-f%s): %s\n", $us, $tag, $msg; } else { $snags_tripped++; - print STDERR "git-debrebase: snag detected (-f$tag): $msg\n"; + print STDERR f_ "%s: snag detected (-f%s): %s\n", $us, $tag, $msg; } } @@ -410,17 +413,17 @@ sub snag ($$;@) { sub snags_maybe_bail () { return if all_snags_summarised(); if ($snags_forced) { - printf STDERR + print STDERR f_ "%s: snags: %d overriden by individual -f options\n", $us, $snags_forced; } if ($snags_tripped) { if ($opt_force) { - printf STDERR + print STDERR f_ "%s: snags: %d overriden by global --force\n", $us, $snags_tripped; } else { - fail sprintf + fail f_ "%s: snags: %d blocker(s) (you could -f, or --force)", $us, $snags_tripped; } @@ -452,26 +455,26 @@ sub fail_unprocessable ($) { changedir $maindir; my ($ffqs, $ffqm, $symref, $ffq_prev, $gdrlast) = ffq_prev_branchinfo(); - my $mangled = <{MR}{S}; - gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip}; + my $any = gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip}; my @earlier; - if (open S, $seriesfile) { + if ($any) { + open S, $seriesfile or confess "$seriesfile $!"; while (my $patch = ) { - chomp $patch or die $!; + chomp $patch or confess $!; $prereq{$patch} //= {}; foreach my $earlier (@earlier) { - $prereq{$patch}{$earlier}{$s}++ and die; + $prereq{$patch}{$earlier}{$s}++ and confess; } push @earlier, $patch; - stat "debian/patches/$patch" or die "$patch ?"; + stat "debian/patches/$patch" or confess "$patch ?"; } - S->error and die "$seriesfile $!"; + S->error and confess "$seriesfile $!"; close S; - } else { - die "$seriesfile $!" unless $!==ENOENT; } read_tree_upstream $newbase, 1; my $pec = make_commit [ grep { defined } $base_q->{MR}{PEC} ], [ @@ -696,7 +698,7 @@ sub merge_series ($$$;@) { my $authordate = sub { my ($f) = @_; $authordate{$f} //= do { - open PF, "<", "debian/patches/$f" or die "$f $!"; + open PF, "<", "debian/patches/$f" or confess "$f $!"; while () { return $nodate if m/^$/; last if s{^Date: }{}; @@ -706,7 +708,7 @@ sub merge_series ($$$;@) { }; }; - open NS, '>', $seriesfile or die $!; + open NS, '>', $seriesfile or confess $!; while (keys %prereq) { my $best; @@ -721,7 +723,7 @@ sub merge_series ($$$;@) { $best = $try; } printdebug "merge_series series next $best\n"; - print NS "$best\n" or die $!; + print NS "$best\n" or confess $!; delete $prereq{$best}; foreach my $gp (values %prereq) { delete $gp->{$best}; @@ -763,9 +765,9 @@ sub merge_series_patchqueue_convert ($$$) { my $tree = cmdoutput @git, qw(write-tree); $commit =~ s{^parent (\S+)$}{parent $build}m or confess; $commit =~ s{^tree (\S+)$}{tree $tree}m or confess; - open C, ">", "../mcommit" or die $!; - print C $commit or die $!; - close C or die $!; + open C, ">", "../mcommit" or confess $!; + print C $commit or confess $!; + close C or confess $!; $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit); } $result = $build; @@ -836,11 +838,11 @@ sub parsecommit ($;$) { # $p_ref, if provided, must be [] and is used as a base for Parents $p_ref //= []; - die if @$p_ref; + confess if @$p_ref; my ($h,$m) = get_commit $objid; - my ($t) = $h =~ m/^tree (\w+)$/m or die $objid; + my ($t) = $h =~ m/^tree (\w+)$/m or confess $objid; my (@ph) = $h =~ m/^parent (\w+)$/mg; my $r = { @@ -929,9 +931,11 @@ sub classify ($) { # reject it here then we avoid making the pseudomerge which # would be needed to push it. - my $badanchor = sub { $unknown->("git-debrebase \`anchor' but @_"); }; - @p == 2 or return $badanchor->("has other than two parents"); - $haspatches and return $badanchor->("contains debian/patches"); + my $badanchor = sub { + $unknown->(f_ "git-debrebase \`anchor' but %s", "@_"); + }; + @p == 2 or return $badanchor->(__ "has other than two parents"); + $haspatches and return $badanchor->(__ "contains debian/patches"); # How to decide about l/r ordering of anchors ? git # --topo-order prefers to expand 2nd parent first. There's @@ -957,11 +961,11 @@ sub classify ($) { # parents from left to right, in order, so it's easy to see # which way round a pseudomerge is. - $p[0]{IsOrigin} and $badanchor->("is an origin commit"); + $p[0]{IsOrigin} and $badanchor->(__ "is an origin commit"); $p[1]{Differs} & ~DS_DEB and - $badanchor->("upstream files differ from left parent"); + $badanchor->(__ "upstream files differ from left parent"); $p[0]{Differs} & ~D_UPS and - $badanchor->("debian/ differs from right parent"); + $badanchor->(__ "debian/ differs from right parent"); return $classify->(qw(Anchor), OrigParents => [ $p[1] ]); @@ -972,7 +976,7 @@ sub classify ($) { if ($d == D_PAT_ADD) { return $classify->(qw(AddPatches)); } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) { - return $unknown->("edits debian/patches"); + return $unknown->(__ "edits debian/patches"); } elsif ($d & DS_DEB and !($d & ~DS_DEB)) { my ($ty,$dummy) = git_cat_file "$p[0]{CommitId}:debian"; if ($ty eq 'tree') { @@ -984,20 +988,20 @@ sub classify ($) { } elsif ($ty eq 'missing') { return $classify->(qw(BreakwaterStart)); } else { - return $unknown->("parent's debian is not a directory"); + return $unknown->(__ "parent's debian is not a directory"); } } elsif ($d == D_UPS) { return $classify->(qw(Upstream)); } elsif ($d & DS_DEB and $d & D_UPS and !($d & ~(DS_DEB|D_UPS))) { return $classify->(qw(Mixed)); } elsif ($d == 0) { - return $unknown->("no changes"); + return $unknown->(__ "no changes"); } else { confess "internal error $objid ?"; } } if (!@p) { - return $unknown->("origin commit"); + return $unknown->(__ "origin commit"); } if (@p == 2 && @identical == 1) { @@ -1010,7 +1014,8 @@ sub classify ($) { if (@p == 2 && @identical == 2) { my $get_t = sub { my ($ph,$pm) = get_commit $_[0]{CommitId}; - $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?"; + $ph =~ m/^committer .* (\d+) [-+]\d+$/m + or confess "$_->{CommitId} ?"; $1; }; my @bytime = @p; @@ -1047,14 +1052,14 @@ sub classify ($) { return $classify->("MergedBreakwaters"); } if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) { - return $unknown->("unknown kind of merge from $1"); + return $unknown->(f_ "unknown kind of merge from %s", $1); } if (@p > 2) { - return $unknown->("octopus merge"); + return $unknown->(__ "octopus merge"); } if (!$opt_merges) { - return $unknown->("general two-parent merge"); + return $unknown->(__ "general two-parent merge"); } return $classify->("VanillaMerge"); @@ -1071,7 +1076,8 @@ sub mergedbreakwaters_anchor ($) { $best_anchor = $panchor if !defined $best_anchor or is_fast_fwd $best_anchor, $panchor; - fail "inconsistent anchors in merged-breakwaters $p->{CommitId}" + fail f_ "inconsistent anchors in merged-breakwaters %s", + $p->{CommitId} unless is_fast_fwd $panchor, $best_anchor; } return $best_anchor; @@ -1110,7 +1116,7 @@ sub keycommits ($;$$$$$) { my $x = sub { my ($cb, $tagsfx, $mainwhy, $xwhy) = @_; my $why = $mainwhy.$xwhy; - my $m = "branch needs laundering (run git-debrebase): $why"; + my $m = f_ "branch needs laundering (run git-debrebase): %s", $why; fail $m unless defined $cb; return unless $cb; $cb->("unclean-$tagsfx", $why, $cl, $mainwhy); @@ -1138,41 +1144,47 @@ sub keycommits ($;$$$$$) { $found_anchor->($head); } elsif ($ty eq 'Upstream') { $x->($unclean, 'ordering', - "packaging change ($breakwater) follows upstream change"," (eg $head)") + (f_ "packaging change (%s) follows upstream change", $breakwater), + (f_ " (eg %s)", $head)) if defined $breakwater; $clogonly = undef; $breakwater = undef; } elsif ($ty eq 'Mixed') { $x->($unclean, 'mixed', - "found mixed upstream/packaging commit"," ($head)"); + (__ "found mixed upstream/packaging commit"), + (f_ " (%s)", $head)); $clogonly = undef; $breakwater = undef; } elsif ($ty eq 'Pseudomerge' or $ty eq 'AddPatches') { my $found_pm = 1; $x->($furniture, (lc $ty), - "found interchange bureaucracy commit ($ty)"," ($head)"); + (f_ "found interchange bureaucracy commit (%s)", $ty), + (f_ " (%s)", $head)); } elsif ($ty eq 'DgitImportUnpatched') { if ($found_pm) { $x->($trouble, 'dgitimport', - "found dgit dsc import"," ($head)"); + (__ "found dgit dsc import"), + (f_ " (%s)", $head)); return (undef,undef); } else { $x->($fatal, 'unprocessable', - "found bare dgit dsc import with no prior history", - " ($head)"); + (__ "found bare dgit dsc import with no prior history"), + (f_ " (%s)", $head)); return (undef,undef); } } elsif ($ty eq 'VanillaMerge') { $x->($trouble, 'vanillamerge', - "found vanilla merge"," ($head)"); + (__ "found vanilla merge"), + (f_ " (%s)", $head)); return (undef,undef); } elsif ($ty eq 'MergedBreakwaters') { $found_anchor->(mergedbreakwaters_anchor $cl); } else { $x->($fatal, 'unprocessable', - "found unprocessable commit, cannot cope: $cl->{Why}", - " ($head)"); + (f_ "found unprocessable commit, cannot cope: %s", + $cl->{Why}), + (f_ " (%s)", $head)); return (undef,undef); } $head = $cl->{Parents}[0]{CommitId}; @@ -1359,7 +1371,7 @@ sub walk ($;$$$) { $cl->{Why} = "bare dgit dsc import"; return $bomb->(); } - die "$ty ?"; + confess "$ty ?"; } elsif ($ty eq 'MergedBreakwaters') { $last_anchor = mergedbreakwaters_anchor $cl; $build_start->(' MergedBreakwaters', $cur); @@ -1570,7 +1582,7 @@ sub walk ($;$$$) { confess "internal error" unless $build eq (pop @processed)->{CommitId}; in_workarea sub { - mkdir $rd or $!==EEXIST or die $!; + mkdir $rd or $!==EEXIST or confess $!; my $current_method; my $want_debian = $build; my $want_upstream = $build; @@ -1680,9 +1692,9 @@ sub walk ($;$$$) { or confess "$ch ?"; } my $cf = "$rd/m$rewriting"; - open CD, ">", $cf or die $!; - print CD $ch, "\n", $cl->{Msg} or die $!; - close CD or die $!; + open CD, ">", $cf or confess $!; + print CD $ch, "\n", $cl->{Msg} or confess $!; + close CD or confess $!; my @cmd = (@git, qw(hash-object)); push @cmd, qw(-w) if $rewriting; push @cmd, qw(-t commit), $cf; @@ -1712,7 +1724,7 @@ sub walk ($;$$$) { }; my $final_check = get_differs $build, $input; - die sprintf "internal error %#x %s %s", $final_check, $input, $build + confess sprintf "internal error %#x %s %s", $final_check, $input, $build if $final_check & ~D_PAT_ADD; my @r = ($build, $breakwater, $last_anchor); @@ -1740,7 +1752,7 @@ sub update_head_checkout ($$$) { sub update_head_postlaunder ($$$) { my ($old, $tip, $reflogmsg) = @_; return if $tip eq $old && !@deferred_updates; - print "git-debrebase: laundered (head was $old)\n"; + print "$us: laundered (head was $old)\n"; update_head $old, $tip, $reflogmsg; # no tree changes except debian/patches runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches); @@ -1795,7 +1807,7 @@ sub cmd_analyse () { $old = git_rev_parse 'HEAD'; } my ($dummy,$breakwater) = walk $old, 1,*STDOUT; - STDOUT->error and die $!; + STDOUT->error and confess $!; } sub ffq_check ($;$$) { @@ -1812,7 +1824,7 @@ sub ffq_check ($;$$) { # normally $currentval should be HEAD my ($currentval, $ff, $notff) =@_; - $ff //= sub { print $_[0] or die $!; }; + $ff //= sub { print $_[0] or confess $!; }; $notff //= \&snag; my ($status, $message, $current, $ffq_prev, $gdrlast) @@ -2051,7 +2063,7 @@ sub cmd_new_upstream () { unless @ARGV && $ARGV[0] !~ m{^-}; my $c = git_rev_parse shift @ARGV; - die unless $n =~ m/^$extra_orig_namepart_re$/; + confess unless $n =~ m/^$extra_orig_namepart_re$/; $newpiece->($n, New => $c); } @@ -2065,7 +2077,7 @@ sub cmd_new_upstream () { my $old_upstream; if (!$old_anchor_cl->{OrigParents}) { snag 'anchor-treated', - 'old anchor is recognised due to --anchor, cannot check upstream'; + __ 'old anchor is recognised due to --anchor, cannot check upstream'; } else { $old_upstream = parsecommit $old_anchor_cl->{OrigParents}[0]{CommitId}; @@ -2171,30 +2183,39 @@ sub cmd_new_upstream () { "[git-debrebase anchor: new upstream $new_upstream_version, merge]", ]; - my $clogsignoff = cmdoutput qw(git show), - '--pretty=format:%an <%ae> %aD', - $new_bw; - # Now we have to add a changelog stanza so the Debian version - # is right. - die if unlink "debian"; - die $! unless $!==ENOENT or $!==ENOTEMPTY; - unlink "debian/changelog" or $!==ENOENT or die $!; - mkdir "debian" or die $!; - open CN, ">", "debian/changelog" or die $!; - my $oldclog = git_cat_file ":debian/changelog"; - $oldclog =~ m/^($package_re) \(\S+\) / or - fail "cannot parse old changelog to get package name"; - my $p = $1; - print CN <('DEBEMAIL', 'user.email'); + $usetup->('DEBFULLNAME', 'user.name'); + +sleep 2; + + my @dch = (qw(debchange + --allow-lower-version .* + --no-auto-nmu + --preserve + --vendor=Unknown-Vendor + --changelog debian/changelog + --check-dirname-level 0 + --release-heuristic=changelog + -v), $new_version, + "Update to new upstream version $new_upstream_version."); + + runcmd @git, qw(checkout -q debian/changelog); + runcmd @dch; runcmd @git, qw(update-index --add --replace), 'debian/changelog'; # Now we have the final new breakwater branch in the index @@ -2222,7 +2243,7 @@ sub cmd_record_ffq_prev () { badusage "no arguments allowed" if @ARGV; my ($status, $msg) = record_ffq_prev_deferred(); if ($status eq 'exists' && $opt_noop_ok) { - print "Previous head already recorded\n" or die $!; + print "Previous head already recorded\n" or confess $!; } elsif ($status eq 'deferred') { run_deferred_updates 'record-ffq-prev'; } else { @@ -2233,13 +2254,13 @@ sub cmd_record_ffq_prev () { sub cmd_anchor () { badusage "no arguments allowed" if @ARGV; my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0; - print "$bw\n" or die $!; + print "$bw\n" or confess $!; } sub cmd_breakwater () { badusage "no arguments allowed" if @ARGV; my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0; - print "$bw\n" or die $!; + print "$bw\n" or confess $!; } sub cmd_status () { @@ -2272,7 +2293,7 @@ sub cmd_status () { my $prcommitinfo = sub { my ($cid) = @_; - flush STDOUT or die $!; + flush STDOUT or confess $!; runcmd @git, qw(--no-pager log -n1), '--pretty=format: %h %s%n', $cid; @@ -2505,7 +2526,7 @@ sub cmd_convert_from_gbp () { my $clogp = parsechangelog(); my $version = $clogp->{'Version'} - // die "missing Version from changelog"; + // die "missing Version from changelog\n"; my ($upstream_spec) = @ARGV; @@ -2628,8 +2649,8 @@ END }; complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp'; - print < \$debuglevel, @@ -2964,9 +2988,9 @@ getoptions_main 'experimental-merge-resolution!', \$opt_merges, '-i:s' => sub { my ($opt,$val) = @_; - badusage "git-debrebase: no cuddling to -i for git-rebase" + badusage f_ "%s: no cuddling to -i for git-rebase", $us if length $val; - die if $opt_defaultcmd_interactive; # should not happen + confess if $opt_defaultcmd_interactive; # should not happen $opt_defaultcmd_interactive = [ qw(-i) ]; # This access to @ARGV is excessive familiarity with # Getopt::Long, but there isn't another sensible @@ -2974,14 +2998,14 @@ getoptions_main push @$opt_defaultcmd_interactive, @ARGV; @ARGV=(); }, - 'help' => sub { print $usage_message or die $!; finish 0; }, + 'help' => sub { print __ $usage_message or confess $!; finish 0; }, ); initdebug('git-debrebase '); enabledebug if $debuglevel; my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel); -chdir $toplevel or die "chdir $toplevel: $!"; +chdir $toplevel or fail "chdir toplevel $toplevel: $!\n"; $rd = fresh_playground "$playprefix/misc"; @@ -2995,7 +3019,7 @@ if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) { $cmdfn =~ y/-/_/; $cmdfn = ${*::}{"cmd_$cmdfn"}; - $cmdfn or badusage "unknown git-debrebase sub-operation $cmd"; + $cmdfn or badusage f_ "unknown git-debrebase sub-operation %s", $cmd; $cmdfn->(); }