chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: test suite: gdr-subcommands: split off XX
[dgit.git]
/
Debian
/
Dgit.pm
diff --git
a/Debian/Dgit.pm
b/Debian/Dgit.pm
index ec402e4d270598e3f7f6ec725812ab7582c8c7a4..3202180587105a7f039278379978b0acd33e0741 100644
(file)
--- a/
Debian/Dgit.pm
+++ b/
Debian/Dgit.pm
@@
-44,7
+44,7
@@
BEGIN {
server_branch server_ref
stat_exists link_ltarget
hashfile
server_branch server_ref
stat_exists link_ltarget
hashfile
- fail ensuredir must_getcwd executable_on_path
+ fail
failmsg
ensuredir must_getcwd executable_on_path
waitstatusmsg failedcmd_waitstatus
failedcmd_report_cmd failedcmd
runcmd cmdoutput cmdoutput_errok
waitstatusmsg failedcmd_waitstatus
failedcmd_report_cmd failedcmd
runcmd cmdoutput cmdoutput_errok
@@
-57,7
+57,7
@@
BEGIN {
$extra_orig_namepart_re
$git_null_obj
$branchprefix
$extra_orig_namepart_re
$git_null_obj
$branchprefix
- $ffq_refprefix
+ $ffq_refprefix
$gdrlast_refprefix
initdebug enabledebug enabledebuglevel
printdebug debugcmd
$debugprefix *debuglevel *DEBUG
initdebug enabledebug enabledebuglevel
printdebug debugcmd
$debugprefix *debuglevel *DEBUG
@@
-87,6
+87,7
@@
our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s;
our $extra_orig_namepart_re = qr{[-0-9a-z]+};
our $git_null_obj = '0' x 40;
our $ffq_refprefix = 'ffq-prev';
our $extra_orig_namepart_re = qr{[-0-9a-z]+};
our $git_null_obj = '0' x 40;
our $ffq_refprefix = 'ffq-prev';
+our $gdrlast_refprefix = 'debrebase-last';
# policy hook exit status bits
# see dgit-repos-server head comment for documentation
# policy hook exit status bits
# see dgit-repos-server head comment for documentation
@@
-220,12
+221,16
@@
sub _us () {
$::us // ($0 =~ m#[^/]*$#, $&);
}
$::us // ($0 =~ m#[^/]*$#, $&);
}
-sub fail
{
+sub fail
msg {
my $s = "@_\n";
$s =~ s/\n\n$/\n/;
my $prefix = _us().": ";
$s =~ s/^/$prefix/gm;
my $s = "@_\n";
$s =~ s/\n\n$/\n/;
my $prefix = _us().": ";
$s =~ s/^/$prefix/gm;
- die $s;
+ return $s;
+}
+
+sub fail {
+ die failmsg @_;
}
sub ensuredir ($) {
}
sub ensuredir ($) {