chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: unpack_playtree_need_cd_work: Make idempotent
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index efb0cea4997e102d225aa896fb0ca88b1c0dbcf4..71bf39dc726c1131ab5797a58be2cefaefedebba 100755
(executable)
--- 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;
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";
foreach (@$updates) {
printdebug ">= ", $_, "\n";
- print U $_, "\n" or confess
$!
;
+ print U $_, "\n" or confess
"$!"
;
}
printdebug ">\$\n";
close U or failedcmd @upd_cmd;
}
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 = <S>) {
if ($any) {
open S, $seriesfile or confess "$seriesfile $!";
while (my $patch = <S>) {
- chomp $patch or confess
$!
;
+ chomp $patch or confess
"$!"
;
$prereq{$patch} //= {};
foreach my $earlier (@earlier) {
$prereq{$patch}{$earlier}{$s}++ and 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;
while (keys %prereq) {
my $best;
@@
-723,7
+723,7
@@
sub merge_series ($$$;@) {
$best = $try;
}
printdebug "merge_series series next $best\n";
$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};
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;
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;
$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 {
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;
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";
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;
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;
$old = git_rev_parse 'HEAD';
}
my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
- STDOUT->error and confess
$!
;
+ STDOUT->error and confess
"$!"
;
}
sub ffq_check ($;$$) {
}
sub ffq_check ($;$$) {
@@
-1828,7
+1828,7
@@
sub ffq_check ($;$$) {
# normally $currentval should be HEAD
my ($currentval, $ff, $notff) =@_;
# 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)
$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) {
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 {
} 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;
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;
}
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 () {
}
sub cmd_status () {
@@
-2311,7
+2311,7
@@
sub cmd_status () {
my $prcommitinfo = sub {
my ($cid) = @_;
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;
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';
};
complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp';
- print f_ <<END, $us or confess
$!
;
+ print f_ <<END, $us or confess
"$!"
;
%s: converted from patched-unapplied (gbp) branch format, OK
END
}
%s: converted from patched-unapplied (gbp) branch format, OK
END
}
@@
-2703,7
+2703,7
@@
sub cmd_convert_to_gbp () {
}
snags_maybe_bail();
update_head_checkout $head, $out, "convert to gbp (v0)";
}
snags_maybe_bail();
update_head_checkout $head, $out, "convert to gbp (v0)";
- print f_ <<END, $us,$us,$us or confess
$!
;
+ print f_ <<END, $us,$us,$us or confess
"$!"
;
%s: converted to git-buildpackage branch format
%s: WARNING: do not now run "git-debrebase" any more
%s: WARNING: doing so would drop all upstream patches!
%s: converted to git-buildpackage branch format
%s: WARNING: do not now run "git-debrebase" any more
%s: WARNING: doing so would drop all upstream patches!
@@
-3030,7
+3030,7
@@
getoptions_main
push @$opt_defaultcmd_interactive, @ARGV;
@ARGV=();
},
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 ');
);
initdebug('git-debrebase ');