X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=06f56d872abe5bcf98a966ae61bf2d2080a7a49a;hp=3101ae7d9dcddb39902d3aa6b71d976d694c5c3c;hb=524d221c7e3b70db546be01d4929a1e9a56e14b7;hpb=0eef00174d9c13c2a7b3c72c9515d5fc89a7feba diff --git a/git-debrebase b/git-debrebase index 3101ae7d..06f56d87 100755 --- a/git-debrebase +++ b/git-debrebase @@ -3,7 +3,8 @@ # Script helping make fast-forwarding histories while still rebasing # upstream deltas when working on Debian packaging # -# Copyright (C)2017,2018 Ian Jackson +# Copyright (C)2017-2019 Ian Jackson +# Copyright (C)2019 Niko Tyni # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,7 +48,7 @@ usages: git-debrebase [] prepush [--prose=...] git-debrebase [] quick|conclude git-debrebase [] new-upstream [
] - git-debrebase [] convert-from-gbp [] + git-debrebase [] convert-from-* ... ... See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit). END @@ -120,7 +121,6 @@ our $playprefix = 'debrebase'; our $rd; our $workarea; -our @git = qw(git); our @dgit = qw(dgit); sub in_workarea ($) { @@ -144,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 confess $!; + open U, "|-", @upd_cmd or confess "$!"; foreach (@$updates) { printdebug ">= ", $_, "\n"; - print U $_, "\n" or confess $!; + print U $_, "\n" or confess "$!"; } printdebug ">\$\n"; close U or failedcmd @upd_cmd; @@ -355,44 +355,6 @@ sub calculate_committer_authline () { return $&; } -sub rm_subdir_cached ($) { - my ($subdir) = @_; - runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir; -} - -sub read_tree_subdir ($$) { - my ($subdir, $new_tree_object) = @_; - rm_subdir_cached $subdir; - runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object; -} - -sub read_tree_debian ($) { - my ($treeish) = @_; - read_tree_subdir 'debian', "$treeish:debian"; - rm_subdir_cached 'debian/patches'; -} - -sub read_tree_upstream ($;$$) { - my ($treeish, $keep_patches, $tree_with_debian) = @_; - # if $tree_with_debian is supplied, will use that for debian/ - # otherwise will save and restore it. - my $debian = - $tree_with_debian ? "$tree_with_debian:debian" - : cmdoutput @git, qw(write-tree --prefix=debian/); - runcmd @git, qw(read-tree), $treeish; - read_tree_subdir 'debian', $debian; - rm_subdir_cached 'debian/patches' unless $keep_patches; -}; - -sub make_commit ($$) { - my ($parents, $message_paras) = @_; - my $tree = cmdoutput @git, qw(write-tree); - my @cmd = (@git, qw(commit-tree), $tree); - push @cmd, qw(-p), $_ foreach @$parents; - push @cmd, qw(-m), $_ foreach @$message_paras; - return cmdoutput @cmd; -} - our @snag_force_opts; sub snag ($$;@) { my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits @@ -611,7 +573,7 @@ sub merge_series ($$$;@) { if ($any) { open S, $seriesfile or confess "$seriesfile $!"; while (my $patch = ) { - chomp $patch or confess $!; + chomp $patch or confess "$!"; $prereq{$patch} //= {}; foreach my $earlier (@earlier) { $prereq{$patch}{$earlier}{$s}++ and confess; @@ -708,7 +670,7 @@ sub merge_series ($$$;@) { }; }; - open NS, '>', $seriesfile or confess $!; + open NS, '>', $seriesfile or confess "$!"; while (keys %prereq) { my $best; @@ -723,7 +685,7 @@ sub merge_series ($$$;@) { $best = $try; } printdebug "merge_series series next $best\n"; - print NS "$best\n" or confess $!; + print NS "$best\n" or confess "$!"; delete $prereq{$best}; foreach my $gp (values %prereq) { delete $gp->{$best}; @@ -765,10 +727,10 @@ 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 confess $!; - print C $commit or confess $!; - close C or confess $!; - $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit); + open C, ">", "../mcommit" or confess "$!"; + print C $commit or confess "$!"; + close C or confess "$!"; + $build = hash_commit '../mcommit'; } $result = $build; mwrecknote($wrecknotes, 'merged-result', $result); @@ -1586,7 +1548,7 @@ sub walk ($;$$$) { confess __ "internal error" unless $build eq (pop @processed)->{CommitId}; in_workarea sub { - mkdir $rd or $!==EEXIST or confess $!; + mkdir $rd or $!==EEXIST or confess "$!"; my $current_method; my $want_debian = $build; my $want_upstream = $build; @@ -1696,9 +1658,9 @@ sub walk ($;$$$) { or confess "$ch ?"; } my $cf = "$rd/m$rewriting"; - open CD, ">", $cf or confess $!; - print CD $ch, "\n", $cl->{Msg} or confess $!; - close CD or confess $!; + 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; @@ -1811,7 +1773,7 @@ sub cmd_analyse () { $old = git_rev_parse 'HEAD'; } my ($dummy,$breakwater) = walk $old, 1,*STDOUT; - STDOUT->error and confess $!; + STDOUT->error and confess "$!"; } sub ffq_check ($;$$) { @@ -1828,7 +1790,7 @@ sub ffq_check ($;$$) { # normally $currentval should be HEAD my ($currentval, $ff, $notff) =@_; - $ff //= sub { print $_[0] or confess $!; }; + $ff //= sub { print $_[0] or confess "$!"; }; $notff //= \&snag; my ($status, $message, $current, $ffq_prev, $gdrlast) @@ -1994,36 +1956,6 @@ sub do_stitch ($;$) { stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose); } -sub upstream_commitish_search ($$) { - my ($upstream_version, $tried) = @_; - # todo: at some point maybe use git-deborig to do this - foreach my $tagpfx ('', 'v', 'upstream/') { - my $tag = $tagpfx.(dep14_version_mangle $upstream_version); - my $new_upstream = git_get_ref "refs/tags/$tag"; - push @$tried, $tag; - return $new_upstream if length $new_upstream; - } -} - -sub resolve_upstream_version ($$) { - my ($new_upstream, $upstream_version) = @_; - - if (!defined $new_upstream) { - my @tried; - $new_upstream = upstream_commitish_search $upstream_version, \@tried; - if (!length $new_upstream) { - fail f_ - "Could not determine appropriate upstream commitish.\n". - " (Tried these tags: %s)\n". - " Check version, and specify upstream commitish explicitly.", - "@tried"; - } - } - $new_upstream = git_rev_parse $new_upstream; - - return $new_upstream; -} - sub cmd_new_upstream () { # automatically and unconditionally launders before rebasing # if rebase --abort is used, laundering has still been done @@ -2043,7 +1975,8 @@ sub cmd_new_upstream () { my $new_upstream = shift @ARGV; my $new_upstream_version = upstreamversion $new_version; - $new_upstream = + my $new_upstream_used; + ($new_upstream, $new_upstream_used) = resolve_upstream_version $new_upstream, $new_upstream_version; record_ffq_auto(); @@ -2257,7 +2190,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 confess $!; + print __ "Previous head already recorded\n" or confess "$!"; } elsif ($status eq 'deferred') { run_deferred_updates 'record-ffq-prev'; } else { @@ -2268,13 +2201,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 "$anchor\n" or confess $!; + print "$anchor\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 confess $!; + print "$bw\n" or confess "$!"; } sub cmd_status () { @@ -2307,7 +2240,7 @@ sub cmd_status () { my $prcommitinfo = sub { my ($cid) = @_; - flush STDOUT or confess $!; + flush STDOUT or confess "$!"; runcmd @git, qw(--no-pager log -n1), '--pretty=format: %h %s%n', $cid; @@ -2537,6 +2470,7 @@ sub complete_convert_from ($$$$) { update_head_checkout $old_head, $new_head, $mrest; } +sub cmd_convert_from_unapplied () { cmd_convert_from_gbp(); } sub cmd_convert_from_gbp () { badusage __ "want only 1 optional argument, the upstream git commitish" unless @ARGV<=1; @@ -2548,7 +2482,7 @@ sub cmd_convert_from_gbp () { my ($upstream_spec) = @ARGV; my $upstream_version = upstreamversion $version; - my $upstream = + my ($upstream, $upstream_used) = resolve_upstream_version($upstream_spec, $upstream_version); my ($old_head, $gdrlastinfo) = begin_convert_from(); @@ -2558,7 +2492,7 @@ sub cmd_convert_from_gbp () { runcmd @git, qw(--no-pager diff --stat), $upstream, $old_head, qw( -- :!/debian :/); - fail f_ <1; + fail __ "takes 1 optional argument, the upstream commitish" if @ARGV>1; my @upstreams; @@ -2728,7 +2662,7 @@ sub cmd_convert_from_dgit_view () { my $spec = shift @ARGV; my $commit = git_rev_parse "$spec^{commit}"; push @upstreams, { Commit => $commit, - Source => "$ARGV[0], from command line", + Source => (f_ "%s, from command line", $spec), Only => 1, }; } @@ -2741,12 +2675,13 @@ sub cmd_convert_from_dgit_view () { keycommits $head, sub{}, sub{}, $trouble, $trouble; printdebug "troubles=$troubles\n"; if (!$troubles) { - print STDERR <{Version}; - print STDERR "Considering possible commits corresponding to upstream:\n"; + print STDERR __ + "Considering possible commits corresponding to upstream:\n"; if (!@upstreams) { if ($do_tags) { my @tried; my $ups_tag = upstream_commitish_search $version, \@tried; if ($ups_tag) { - my $this = "git tag $tried[-1]"; + my $this = f_ "git tag %s", $tried[-1]; push @upstreams, { Commit => $ups_tag, Source => $this, }; } else { - printf STDERR + print STDERR f_ " git tag: no suitable tag found (tried %s)\n", "@tried"; } @@ -2778,11 +2714,12 @@ END # we do a quick check to see if there are plausible origs my $something=0; if (!opendir BPD, $bpd) { - die "opendir build-products-dir $bpd: $!" unless $!==ENOENT; + die f_ "opendir build-products-dir %s: %s", $bpd, $! + unless $!==ENOENT; } else { while ($!=0, my $f = readdir BPD) { next unless is_orig_file_of_p_v $f, $p, $version; - printf STDERR + print STDERR f_ " orig: found what looks like a .orig, %s\n", "$bpd/$f"; $something=1; @@ -2813,7 +2750,7 @@ END }; } } else { - printf STDERR + print STDERR f_ " orig: no suitable origs found (looked for %s in %s)\n", "${p}_".(stripeoch $version)."...", $bpd; } @@ -2822,7 +2759,8 @@ END my $some_patches = stat_exists 'debian/patches/series'; - print STDERR "Evaluating possible commits corresponding to upstream:\n"; + print STDERR __ + "Evaluating possible commits corresponding to upstream:\n"; my $result; foreach my $u (@upstreams) { @@ -2858,7 +2796,7 @@ END } my $r = system @gbp_cmd; if ($r) { - printf STDERR + print STDERR f_ " %s: couldn't apply patches: gbp pq %s", $u->{Source}, waitstatusmsg(); return; @@ -2867,8 +2805,9 @@ END my $work = git_rev_parse qw(HEAD); my $diffout = cmdoutput @git, qw(diff-tree --stat HEAD), $work; if (length $diffout) { - print STDERR - " $u->{Source}: applying patches gives different tree\n"; + print STDERR f_ + " %s: applying patches gives different tree\n", + $u->{Source}; print STDERR $diffout if $diagnose; return; } @@ -2880,24 +2819,26 @@ END } if (!$result) { - fail <{Source}; + print STDERR f_ "Yes, will base new branch on %s\n", $result->{Source}; complete_convert_from $head, $result->{Result}, $gdrlastinfo, 'convert-from-dgit-view'; } sub cmd_forget_was_ever_debrebase () { - badusage "forget-was-ever-debrebase takes no further arguments" if @ARGV; + badusage __ "forget-was-ever-debrebase takes no further arguments" + if @ARGV; my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) = ffq_prev_branchinfo(); - fail "Not suitable for recording git-debrebaseness anyway: $ffq_msg" + fail f_ "Not suitable for recording git-debrebaseness anyway: %s", + $ffq_msg if defined $ffq_msg; push @deferred_updates, "delete $ffq_prev"; push @deferred_updates, "delete $gdrlast"; @@ -2998,7 +2939,7 @@ setlocale(LC_MESSAGES, ""); textdomain("git-debrebase"); getoptions_main - ("bad options\n", + (__ "bad options\n", "D+" => \$debuglevel, 'noop-ok', => \$opt_noop_ok, 'f=s' => \@snag_force_opts, @@ -3018,14 +2959,13 @@ getoptions_main push @$opt_defaultcmd_interactive, @ARGV; @ARGV=(); }, - 'help' => sub { print __ $usage_message or confess $!; 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 fail "chdir toplevel $toplevel: $!\n"; +changedir_git_toplevel(); $rd = fresh_playground "$playprefix/misc";