From 07228b643d0a07e1ec738b7c70fca5f4a6a58d68 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 1 Mar 2019 18:19:06 +0000 Subject: git-debrebase: resolve_upstream_version: Return $used too Update both callers but right now they just throw the information away. So no overall functional change. Signed-off-by: Ian Jackson --- git-debrebase | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'git-debrebase') diff --git a/git-debrebase b/git-debrebase index 829ab82..20e5728 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2008,6 +2008,7 @@ sub upstream_commitish_search ($$) { sub resolve_upstream_version ($$) { my ($new_upstream, $upstream_version) = @_; + my $used = $new_upstream; if (!defined $new_upstream) { my @tried; $new_upstream = upstream_commitish_search $upstream_version, \@tried; @@ -2018,10 +2019,12 @@ sub resolve_upstream_version ($$) { " Check version, and specify upstream commitish explicitly.", "@tried"; } + $used = $tried[-1]; } $new_upstream = git_rev_parse $new_upstream; - return $new_upstream; + return ($new_upstream, $used); + # used is a human-readable idea of what we found } sub cmd_new_upstream () { @@ -2043,7 +2046,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(); @@ -2549,7 +2553,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(); -- cgit v1.2.3 From 6123e69cb8bc61f112d455ca8df5b6c68fa7e6f6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 1 Mar 2019 18:36:50 +0000 Subject: git-debrebase: convert-*: Fix two broken error messages If you failed to specify the upstream version, some of the messages would still attempt to report what you specified, causing a crash. Closes: #922462 Signed-off-by: Ian Jackson --- git-debrebase | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'git-debrebase') diff --git a/git-debrebase b/git-debrebase index 20e5728..efb0cea 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2563,7 +2563,7 @@ sub cmd_convert_from_gbp () { runcmd @git, qw(--no-pager diff --stat), $upstream, $old_head, qw( -- :!/debian :/); - fail f_ < Date: Sun, 26 May 2019 10:50:23 +0100 Subject: Replace `confess $!' with `confess "$!"', to actually print errno $ perl -e 'use Carp; open X, ">/dev/eacces" or die $!' Permission denied at -e line 1. $ perl -e 'use Carp; open X, ">/dev/eacces" or confess $!' at -e line 1. $ perl -e 'use Carp; open X, ">/dev/eacces" or confess "$!"' Permission denied at -e line 1. $ confess will get references to its arguments in @_. Its documentation says it saves/restores $!. I conjecture that these interact as we see here: $ perl -e '$!=1; sub x { print ">@_<\n"; } x $!;' >Operation not permitted< $ perl -e '$!=1; sub x { local $!; print ">@_<\n"; } x $!;' >< Quoting "$!" averts the reference (and it will also ensure that we get the string value of $!, in case confess were to do anything in the future which would mess that up). This commit was made like this: perl -i -pe 's/confess \$!/confess "\$!"/g' dgit perl -i -pe 's/confess \$!/confess "\$!"/g' git-debrebase perl -i -pe 's/confess \$!/confess "\$!"/g' Debian/Dgit.pm I have manually reviewed each hunk and it all looks good to me. Closes: #929549 Signed-off-by: Ian Jackson --- git-debrebase | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'git-debrebase') diff --git a/git-debrebase b/git-debrebase index efb0cea..71bf39d 100755 --- a/git-debrebase +++ b/git-debrebase @@ -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; @@ -611,7 +611,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 +708,7 @@ sub merge_series ($$$;@) { }; }; - open NS, '>', $seriesfile or confess $!; + open NS, '>', $seriesfile or confess "$!"; while (keys %prereq) { my $best; @@ -723,7 +723,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,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 confess $!; - print C $commit or confess $!; - close C 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); } $result = $build; @@ -1586,7 +1586,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 +1696,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 +1811,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 +1828,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) @@ -2261,7 +2261,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 { @@ -2272,13 +2272,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 () { @@ -2311,7 +2311,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; @@ -2674,7 +2674,7 @@ END }; complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp'; - print f_ < sub { print __ $usage_message or confess $!; finish 0; }, + 'help' => sub { print __ $usage_message or confess "$!"; finish 0; }, ); initdebug('git-debrebase '); -- cgit v1.2.3