map { $_->{Filename} } dsc_files_info();
}
-sub is_orig_file ($) {
- local ($_) = @_;
- m/\.orig(?:-\w+)?\.tar\.\w+$/;
+sub is_orig_file ($;$) {
+ local ($_) = $_[0];
+ my $base = $_[1];
+ m/\.orig(?:-\w+)?\.tar\.\w+$/ or return 0;
+ defined $base or return 1;
+ return $` eq $base;
}
sub make_commit ($) {
}
}
+sub commit_admin ($) {
+ my ($m) = @_;
+ progress "$m";
+ runcmd_ordryrun_local @git, qw(commit -m), $m;
+}
+
sub commit_quilty_patch () {
my $output = cmdoutput @git, qw(status --porcelain);
my %adds;
return;
}
runcmd_ordryrun_local @git, qw(add), sort keys %adds;
- my $m = "Commit Debian 3.0 (quilt) metadata";
- progress "$m";
- runcmd_ordryrun_local @git, qw(commit -m), $m;
+ commit_admin "Commit Debian 3.0 (quilt) metadata";
+}
+
+sub get_source_format () {
+ if (!open F, "debian/source/format") {
+ die $! unless $!==&ENOENT;
+ return '';
+ }
+ $_ = <F>;
+ F->error and die $!;
+ chomp;
+ return $_;
}
sub madformat ($) {
our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
sub build_maybe_quilt_fixup () {
- if (!open F, "debian/source/format") {
- die $! unless $!==&ENOENT;
- return;
- }
- $_ = <F>;
- F->error and die $!;
- chomp;
- return unless madformat($_);
+ my $format=get_source_format;
+ return unless madformat $format;
# sigh
my @cmd = (@git, qw(ls-files --exclude-standard -iodm));