From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 49A3E1F4B4 for ; Fri, 11 Sep 2020 08:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725535AbgIKIA0 (ORCPT ); Fri, 11 Sep 2020 04:00:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725601AbgIKIAW (ORCPT ); Fri, 11 Sep 2020 04:00:22 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A08DFC061756 for ; Fri, 11 Sep 2020 01:00:21 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id y15so3864306wmi.0 for ; Fri, 11 Sep 2020 01:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=1fKzNKEs1POxgWpvxCsSi9q8KGe/+VjQay0CbX29ED4=; b=EBe+E7LKmyL0zGNgZgzpGpneek7xKDAWnVfOkTPZ+I/Ggo8MNayjBLzaYvk0WydiZM QUu9zxg/0w62Ss9fxjWlD2qUWcgw9G6hHO67PzneWBzmbCpLB8LV55Iq3MWHRscxMCfF M/OthLhfk2JD6LPkyF89nT0a8G9yFqFdJs74XKVGRMP/OwvRg8KievcxCFzYLdITwqdk fAq4qzNn1LBdMOxCBK+ql0Z9e/abLLMgEjKLB/L8EZfhmJ8N+f3H5D73SrHG8GkKThMn NjfLl+YMufB8yEbGwh+DAxwNvlSFAGJ8FWbVdnKEUCByIjwJjJxTcHQcdy7A2RE0XwY/ AcFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=1fKzNKEs1POxgWpvxCsSi9q8KGe/+VjQay0CbX29ED4=; b=QtwBGdQXcxVOAWU4CNNabfI60Ix7A4s2frX6VoWIUsYVDbbWm+fNOKYRiLOf1rRh8E /AUb8Mh1xKPkXqvlQdUgQVWpZ+2jvaWgIBHbVpscshoBtkQihtAoX1Z0kJSzeynDjklm xTlfZgOv26tUVzKqszUvFlzXLv+7d2cAYw1RKyI5lbGuLCGLKFMjFfnrzG3UovmwA3qL Zbe6peoYb9aCNaf+konGwBfVVkCqy2DTD0DmHfceVCy6w/E5+NVrTZLiWP07LivcDmsM xCQVERWxlyQgVOMpHFWC2HR33TCzjG0KpUaQXeBQoQ/5pseUfO/t1Ig16XgZWIqF8IoF ihDw== X-Gm-Message-State: AOAM531qLFKhlHjpm1L4O0ukjLOr20eXrXNXX2glqgvv+UjaOqTO5oev TQRqrXrrMIu2sR7A0DwyulEYxqlgspY= X-Google-Smtp-Source: ABdhPJyhlTctSLBLgXPXgCIyT+yWgIyQ2zu4G+mqWz34M0jB8o5dJd3FAxx5V7hIQ4AJXNgtt+3b1Q== X-Received: by 2002:a1c:7502:: with SMTP id o2mr889982wmc.29.1599811220181; Fri, 11 Sep 2020 01:00:20 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h8sm2895983wrw.68.2020.09.11.01.00.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 01:00:19 -0700 (PDT) Message-Id: <97232523112b433a4273ff5b4c132ca4fe3cf07c.1599811217.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Lukas via GitGitGadget" Date: Fri, 11 Sep 2020 08:00:16 +0000 Subject: [PATCH 1/2] svn: added: Multi line support for ignore-paths Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Lukas Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Lukas With this change ths user is able to ignore more than a couple of folder. The git configuration has a max char length per line, so the user is limited if he want to ignor many folders/files. With this patch the ignore-paths expression is generated by all given lines. Example: ignore-paths=.*/somefolder1/ ignore-paths=base/differentfolder2/.* Signed-off-by: Lukas Pupka-Lipinski --- perl/Git/SVN/Fetcher.pm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm index 64e900a0e9..96b14538b0 100644 --- a/perl/Git/SVN/Fetcher.pm +++ b/perl/Git/SVN/Fetcher.pm @@ -31,15 +31,17 @@ sub new { # override options set in an [svn-remote "..."] section $repo_id = $git_svn->{repo_id}; my $k = "svn-remote.$repo_id.ignore-paths"; - my $v = eval { command_oneline('config', '--get', $k) }; - $self->{ignore_regex} = $v; + my @config = eval { command( 'config', '--get-all', $k ) }; + chomp(@config); # Replace all \n\r on the end + $self->{ignore_regex} = '(?:'.join('|', @config).')'; $k = "svn-remote.$repo_id.include-paths"; - $v = eval { command_oneline('config', '--get', $k) }; - $self->{include_regex} = $v; + @config = eval { command( 'config', '--get-all', $k ) }; + chomp(@config); # Replace all \n\r on the end + $self->{include_regex} = '(?:'.join('|', @config).')'; $k = "svn-remote.$repo_id.preserve-empty-dirs"; - $v = eval { command_oneline('config', '--get', '--bool', $k) }; + my $v = eval { command_oneline('config', '--get', '--bool', $k) }; if ($v && $v eq 'true') { $_preserve_empty_dirs = 1; $k = "svn-remote.$repo_id.placeholder-filename"; -- gitgitgadget