diff mbox series

git-svn: Skip commit if all items of a commit are ignored by ignore configuration

Message ID b20ed6ca-1283-fb6d-a00c-94557218e01c@lpl-mind.de (mailing list archive)
State New, archived
Headers show
Series git-svn: Skip commit if all items of a commit are ignored by ignore configuration | expand

Commit Message

Lukas Pupka-Lipinski March 27, 2020, 8:11 a.m. UTC
I used the ignore-paths option to ignore a lot of stuff I don’t need. 
The ignore pattern works well, but it could and up in empty commits. So 
just the message without any modifications / changes. The patch below 
skip a commit if all changes are ignored by the ignore-paths option.


Signed-off-by: Lukas Pupka-Lipinski <lukas.pupkalipinski@lpl-mind.de>

---
  perl/Git/SVN/Ra.pm | 32 +++++++++++++++++++++++++++++---
  1 file changed, 29 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 56ad9870bc..a5a6c0b774 100644
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -457,13 +457,22 @@  sub gs_fetch_loop_common {
              $find_trailing_edge = 0;
          }
          $SVN::Error::handler = $err_handler;
-
+
          my %exists = map { $_->path => $_ } @$gsv;
          foreach my $r (sort {$a <=> $b} keys %revs) {
              my ($paths, $logged) = @{delete $revs{$r}};
-
              foreach my $gs ($self->match_globs(\%exists, $paths,
                                                 $globs, $r)) {
+
+
+                my $fetcher=Git::SVN::Fetcher->new($gs);
+
+                my $skip=$self->is_empty_commit($paths,$fetcher);
+                if ($skip){
+                    print "skip commit $r\n";
+                    next;
+                }
+                $fetcher->close_edit();
                  if ($gs->rev_map_max >= $r) {
                      next;
                  }
@@ -506,6 +517,21 @@  sub gs_fetch_loop_common {
Git::SVN::gc();
  }

+sub is_empty_commit{
+    my ($self, $paths,$fetcher) = @_;
+    my $path="";
+    foreach $path (keys %$paths){
+        unless (defined $path && -d $path ){
+            my $ignored=$fetcher->is_path_ignored($path);
+            if (!$ignored){
+                return 0;
+            }
+        }
+    }
+    return 1;
+}
+
+
  sub get_dir_globbed {
      my ($self, $left, $depth, $r) = @_;