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: Break out @forbid in check_not_dirty
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index d443c34db76daed99736e2c4d037b791cdcfa29b..5754e45676393f15294a16cbc27e79512b8017ec 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2224,18
+2224,18
@@
sub generate_commits_from_dsc () {
printdebug "considering saving $f: ";
printdebug "considering saving $f: ";
- if (
link
$f, $upper_f) {
+ if (
rename_link_xf 1,
$f, $upper_f) {
printdebug "linked.\n";
printdebug "linked.\n";
- } elsif ((printdebug "($
!
) "),
+ } elsif ((printdebug "($
@
) "),
$! != EEXIST) {
$! != EEXIST) {
- fail f_ "saving %s: %s", "$buildproductsdir/$f", $
!
;
+ fail f_ "saving %s: %s", "$buildproductsdir/$f", $
@
;
} elsif (!$refetched) {
printdebug "no need.\n";
} elsif (!$refetched) {
printdebug "no need.\n";
- } elsif (
link
$f, "$upper_f,fetch") {
+ } elsif (
rename_link_xf 1,
$f, "$upper_f,fetch") {
printdebug "linked (using ...,fetch).\n";
printdebug "linked (using ...,fetch).\n";
- } elsif ((printdebug "($
!
) "),
+ } elsif ((printdebug "($
@
) "),
$! != EEXIST) {
$! != EEXIST) {
- fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $
!
;
+ fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $
@
;
} else {
printdebug "cannot.\n";
}
} else {
printdebug "cannot.\n";
}
@@
-3817,7
+3817,8
@@
sub pull () {
}
sub check_not_dirty () {
}
sub check_not_dirty () {
- foreach my $f (qw(local-options local-patch-header)) {
+ my @forbid = qw(local-options local-patch-header);
+ foreach my $f (@forbid) {
if (stat_exists "debian/source/$f") {
fail f_ "git tree contains debian/source/%s", $f;
}
if (stat_exists "debian/source/$f") {
fail f_ "git tree contains debian/source/%s", $f;
}
@@
-5805,7
+5806,9
@@
sub quilt_fixup_singlepatch ($$$) {
changedir "..";
runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
rename srcfn("$upstreamversion", "/debian/patches"),
changedir "..";
runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
rename srcfn("$upstreamversion", "/debian/patches"),
- "work/debian/patches";
+ "work/debian/patches"
+ or $!==ENOENT
+ or confess "install d/patches: $!";
changedir "work";
commit_quilty_patch();
changedir "work";
commit_quilty_patch();
@@
-6601,8
+6604,8
@@
sub build_source {
my $mv = sub {
my ($why, $l) = @_;
printdebug " renaming ($why) $l\n";
my $mv = sub {
my ($why, $l) = @_;
printdebug " renaming ($why) $l\n";
- rename "$l", bpd_abs()."/$l"
- or fail f_ "put in place new built file (%s): %s", $l, $
!
;
+ rename
_link_xf 0,
"$l", bpd_abs()."/$l"
+ or fail f_ "put in place new built file (%s): %s", $l, $
@
;
};
foreach my $l (split /\n/, getfield $dsc, 'Files') {
$l =~ m/\S+$/ or next;
};
foreach my $l (split /\n/, getfield $dsc, 'Files') {
$l =~ m/\S+$/ or next;
@@
-7374,7
+7377,10
@@
$cmd =~ y/-/_/;
my $pre_fn = ${*::}{"pre_$cmd"};
$pre_fn->() if $pre_fn;
my $pre_fn = ${*::}{"pre_$cmd"};
$pre_fn->() if $pre_fn;
-record_maindir if $invoked_in_git_tree;
+if ($invoked_in_git_tree) {
+ changedir_git_toplevel();
+ record_maindir();
+}
git_slurp_config();
my $fn = ${*::}{"cmd_$cmd"};
git_slurp_config();
my $fn = ${*::}{"cmd_$cmd"};