chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i18n: dgit: mark some messages (8)
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index e2305834c473cad92aca587cc7d7c6d702e73e6f..359868215a61743f5cd932cab1fdc5cde0ff0059 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-5356,16
+5356,17
@@
END
" to record .gitignore changes",
$gipatch
if (stat _)[7];
" to record .gitignore changes",
$gipatch
if (stat _)[7];
- print GIPATCH
<<END
or die "$gipatch: $!";
+ print GIPATCH
+(__ <<END).<<ENDU
or die "$gipatch: $!";
Subject: Update .gitignore from Debian packaging branch
The Debian packaging git branch contains these updates to the upstream
.gitignore file(s). This patch is autogenerated, to provide these
updates to users of the official Debian archive view of the package.
Subject: Update .gitignore from Debian packaging branch
The Debian packaging git branch contains these updates to the upstream
.gitignore file(s). This patch is autogenerated, to provide these
updates to users of the official Debian archive view of the package.
+END
[dgit ($our_version) update-gitignore]
---
[dgit ($our_version) update-gitignore]
---
-END
+END
U
close GIPATCH or die "$gipatch: $!";
runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
$unapplied, $headref, "--", sort keys %$editedignores;
close GIPATCH or die "$gipatch: $!";
runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
$unapplied, $headref, "--", sort keys %$editedignores;
@@
-5377,11
+5378,12
@@
END
print SERIES "auto-gitignore\n" or die $!;
close SERIES or die $!;
runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
print SERIES "auto-gitignore\n" or die $!;
close SERIES or die $!;
runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
- commit_admin
<<END
+ commit_admin
+(__ <<END).<<ENDU
Commit patch to update .gitignore
Commit patch to update .gitignore
+END
[dgit ($our_version) update-gitignore-quilt-fixup]
[dgit ($our_version) update-gitignore-quilt-fixup]
-END
+END
U
}
my $dgitview = git_rev_parse 'HEAD';
}
my $dgitview = git_rev_parse 'HEAD';
@@
-5391,8
+5393,8
@@
END
changedir "$playground/work";
changedir "$playground/work";
- my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
- progress
"dgit view: created ($saved)"
;
+ my $saved = maybe_split_brain_save $headref, $dgitview,
__
"converted";
+ progress
f_ "dgit view: created (%s)", $saved
;
}
sub quiltify ($$$$) {
}
sub quiltify ($$$$) {
@@
-5457,7
+5459,7
@@
sub quiltify ($$$$) {
my $c = shift @todo;
next if $considered{$c->{Commit}}++;
my $c = shift @todo;
next if $considered{$c->{Commit}}++;
- $not->($c, "maximum search space exceeded") if --$max_work <= 0;
+ $not->($c,
__
"maximum search space exceeded") if --$max_work <= 0;
printdebug "quiltify investigate $c->{Commit}\n";
printdebug "quiltify investigate $c->{Commit}\n";
@@
-5475,7
+5477,7
@@
sub quiltify ($$$$) {
}
my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
}
my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
- $not->($c,
"has $c_sentinels not $t_sentinels"
)
+ $not->($c,
f_ "has %s not %s", $c_sentinels, $t_sentinels
)
if $c_sentinels ne $t_sentinels;
my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
if $c_sentinels ne $t_sentinels;
my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
@@
-5484,13
+5486,14
@@
sub quiltify ($$$$) {
my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
@parents = map { { Commit => $_, Child => $c } } @parents;
my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
@parents = map { { Commit => $_, Child => $c } } @parents;
- $not->($c, "root commit") if !@parents;
+ $not->($c,
__
"root commit") if !@parents;
foreach my $p (@parents) {
$p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
}
my $ndiffers = grep { $_->{Nontrivial} } @parents;
foreach my $p (@parents) {
$p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
}
my $ndiffers = grep { $_->{Nontrivial} } @parents;
- $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
+ $not->($c, f_ "merge (%s nontrivial parents)", $ndiffers)
+ if $ndiffers > 1;
foreach my $p (@parents) {
printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
foreach my $p (@parents) {
printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
@@
-5500,7
+5503,7
@@
sub quiltify ($$$$) {
my $patchstackchange = cmdoutput @cmd;
if (length $patchstackchange) {
$patchstackchange =~ s/\n/,/g;
my $patchstackchange = cmdoutput @cmd;
if (length $patchstackchange) {
$patchstackchange =~ s/\n/,/g;
- $not->($p,
"changed $patchstackchange"
);
+ $not->($p,
f_ "changed %s", $patchstackchange
);
}
printdebug " search queue P=$p->{Commit} ",
}
printdebug " search queue P=$p->{Commit} ",
@@
-5517,19
+5520,17
@@
sub quiltify ($$$$) {
$x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
return $x;
};
$x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
return $x;
};
- my $reportnot = sub {
- my ($notp) = @_;
- my $s = $abbrev->($notp);
- my $c = $notp->{Child};
- $s .= "..".$abbrev->($c) if $c;
- $s .= ": ".$notp->{Whynot};
- return $s;
- };
if ($quilt_mode eq 'linear') {
if ($quilt_mode eq 'linear') {
- print STDERR "\n$us: error: quilt fixup cannot be linear. Stopped at:\n";
+ print STDERR f_
+ "\n%s: error: quilt fixup cannot be linear. Stopped at:\n",
+ $us;
my $all_gdr = !!@nots;
foreach my $notp (@nots) {
my $all_gdr = !!@nots;
foreach my $notp (@nots) {
- print STDERR "$us: ", $reportnot->($notp), "\n";
+ my $c = $notp->{Child};
+ my $cprange = $abbrev->($notp);
+ $cprange .= "..".$abbrev->($c) if $c;
+ print STDERR f_ "%s: %s: %s\n",
+ $us, $cprange, $notp->{Whynot};
$all_gdr &&= $notp->{Child} &&
(git_cat_file $notp->{Child}{Commit}, 'commit')
=~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
$all_gdr &&= $notp->{Child} &&
(git_cat_file $notp->{Child}{Commit}, 'commit')
=~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
@@
-5539,13
+5540,13
@@
sub quiltify ($$$$) {
[ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
if $all_gdr;
print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
[ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
if $all_gdr;
print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
- fail
+ fail
__
"quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n";
} elsif ($quilt_mode eq 'smash') {
} elsif ($quilt_mode eq 'auto') {
"quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n";
} elsif ($quilt_mode eq 'smash') {
} elsif ($quilt_mode eq 'auto') {
- progress "quilt fixup cannot be linear, smashing...";
+ progress
__
"quilt fixup cannot be linear, smashing...";
} else {
} else {
-
die
"$quilt_mode ?";
+
confess
"$quilt_mode ?";
}
my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
}
my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
@@
-5555,12
+5556,14
@@
sub quiltify ($$$$) {
quiltify_dpkg_commit "auto-$version-$target-$time",
(getfield $clogp, 'Maintainer'),
quiltify_dpkg_commit "auto-$version-$target-$time",
(getfield $clogp, 'Maintainer'),
- "Automatically generated patch ($clogp->{Version})\n".
- "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
+ (f_ "Automatically generated patch (%s)\n".
+ "Last (up to) %s git changes, FYI:\n\n",
+ $clogp->{Version}, $ncommits).
+ $msg;
return;
}
return;
}
- progress "quiltify linearisation planning successful, executing...";
+ progress
__
"quiltify linearisation planning successful, executing...";
for (my $p = $sref_S;
my $c = $p->{Child};
for (my $p = $sref_S;
my $c = $p->{Child};
@@
-5766,11
+5769,12
@@
sub unpack_playtree_linkorigs ($$) {
sub quilt_fixup_delete_pc () {
runcmd @git, qw(rm -rqf .pc);
sub quilt_fixup_delete_pc () {
runcmd @git, qw(rm -rqf .pc);
- commit_admin <<END
+ commit_admin <<END
.<<ENDU
Commit removal of .pc (quilt series tracking data)
Commit removal of .pc (quilt series tracking data)
+END
[dgit ($our_version) upgrade quilt-remove-pc]
[dgit ($our_version) upgrade quilt-remove-pc]
-END
+END
U
}
sub quilt_fixup_singlepatch ($$$) {
}
sub quilt_fixup_singlepatch ($$$) {
~ianmdlvl / dgit.git / blobdiff