View | Details | Raw Unified | Return to bug 41274
Collapse All | Expand All

(-)a/Koha/Devel/Files.pm (-5 / +24 lines)
Lines 146-151 sub build_git_exclude { Link Here
146
    return $exclude_list;
146
    return $exclude_list;
147
}
147
}
148
148
149
=head2 remove_exceptions
150
151
    @files = $file_manager->remove_exceptions($files, $filetype);
152
153
Remove from exceptions from the original file list.
154
155
=cut
156
157
sub remove_exceptions {
158
    my ( $self, $files, $filetype ) = @_;
159
    my @files = @$files;
160
    return () unless @files;
161
    my @exceptions = @{ $exceptions->{$filetype}->{ $self->{context} } // [] };
162
    if (@exceptions) {
163
        my $cmd             = qq{git ls-files @exceptions};
164
        my @exception_files = qx{$cmd};
165
        chomp for @exception_files;
166
        @files = array_minus @files, @exception_files;
167
    }
168
    return @files;
169
}
170
149
=head2 ls_files
171
=head2 ls_files
150
172
151
    my @files = $file_manager->ls_files( $filetype, $git_range );
173
    my @files = $file_manager->ls_files( $filetype, $git_range );
Lines 160-166 sub ls_files { Link Here
160
    if ($git_range) {
182
    if ($git_range) {
161
        $git_range =~ s|\.\.| |;
183
        $git_range =~ s|\.\.| |;
162
        my @modified_files = qx{git diff --name-only $git_range};
184
        my @modified_files = qx{git diff --name-only $git_range};
163
        chomp @modified_files;
185
        chomp for @modified_files;
164
        if ( $filetype eq 'pl' ) {
186
        if ( $filetype eq 'pl' ) {
165
            push @files, grep { -e && /\.(pl|PL|pm|t)$/ } @modified_files;
187
            push @files, grep { -e && /\.(pl|PL|pm|t)$/ } @modified_files;
166
            push @files, grep { -e && /^(svc|opac\/svc)/ } @modified_files;
188
            push @files, grep { -e && /^(svc|opac\/svc)/ } @modified_files;
Lines 169-177 sub ls_files { Link Here
169
        } elsif ( $filetype eq 'tt' ) {
191
        } elsif ( $filetype eq 'tt' ) {
170
            push @files, grep { -e && /\.(tt|inc)$/ } @modified_files;
192
            push @files, grep { -e && /\.(tt|inc)$/ } @modified_files;
171
        }
193
        }
172
194
        @files = $self->remove_exceptions( \@files, $filetype );
173
        my @exception_files = $exceptions->{$filetype}->{ $self->{context} };
174
        @files = array_minus( @files, @exception_files );
175
    } else {
195
    } else {
176
        if ( $filetype eq 'pl' ) {
196
        if ( $filetype eq 'pl' ) {
177
            @files = $self->ls_perl_files;
197
            @files = $self->ls_perl_files;
178
- 

Return to bug 41274