From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benoit Sigoure Subject: [PATCH 2/5] Implement git svn create-ignore. Date: Mon, 15 Oct 2007 17:35:03 +0200 Message-ID: <1192462506-3783-2-git-send-email-tsuna@lrde.epita.fr> References: <1192462506-3783-1-git-send-email-tsuna@lrde.epita.fr> Cc: normalperson@yhbt.net, Benoit Sigoure To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Oct 16 16:37:43 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IhnYE-0006VL-S4 for gcvg-git-2@gmane.org; Tue, 16 Oct 2007 16:37:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932728AbXJPOha (ORCPT ); Tue, 16 Oct 2007 10:37:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932605AbXJPOha (ORCPT ); Tue, 16 Oct 2007 10:37:30 -0400 Received: from 1.139.39-62.rev.gaoland.net ([62.39.139.1]:56254 "EHLO tsunaxbook.lrde.epita.fr" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759126AbXJPOh2 (ORCPT ); Tue, 16 Oct 2007 10:37:28 -0400 Received: by tsunaxbook.lrde.epita.fr (Postfix, from userid 501) id 1682BB411B5; Mon, 15 Oct 2007 17:35:07 +0200 (CEST) X-Mailer: git-send-email 1.5.3.4.214.g6f43 In-Reply-To: <1192462506-3783-1-git-send-email-tsuna@lrde.epita.fr> Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: * git-svn.perl (%cmd): Add the new command `create-ignore'. (&cmd_create_ignore): New. * t/t9101-git-svn-props.sh: Adjust the test-case for show-ignore and add a test case for create-ignore. Signed-off-by: Benoit Sigoure --- git-svn.perl | 27 +++++++++++++++++++++++++++ t/t9101-git-svn-props.sh | 28 +++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index abc83ec..94091ea 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -123,6 +123,10 @@ my %cmd = ( 'set-tree' => [ \&cmd_set_tree, "Set an SVN repository to a git tree-ish", { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ], + 'create-ignore' => [ \&cmd_create_ignore, + 'Create a .gitignore per svn:ignore', + { 'revision|r=i' => \$_revision + } ], 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings", { 'revision|r=i' => \$_revision } ], @@ -499,6 +503,29 @@ sub cmd_show_ignore { }); } +sub cmd_create_ignore { + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + $gs ||= Git::SVN->new; + my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum); + $gs->prop_walk($gs->{path}, $r, sub { + my ($gs, $path, $props) = @_; + # $path is of the form /path/to/dir/ + my $ignore = '.' . $path . '.gitignore'; + my $s = $props->{'svn:ignore'} or return; + open(GITIGNORE, '>', $ignore) + or fatal("Failed to open `$ignore' for writing: $!\n"); + $s =~ s/[\r\n]+/\n/g; + chomp $s; + # Prefix all patterns so that the ignore doesn't apply + # to sub-directories. + $s =~ s#^#/#gm; + print GITIGNORE "$s\n"; + close(GITIGNORE) + or fatal("Failed to close `$ignore': $!\n"); + command_noisy('add', $ignore); + }); +} + sub cmd_multi_init { my $url = shift; unless (defined $_trunk || defined $_branches || defined $_tags) { diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh index 5aac644..796d80e 100755 --- a/t/t9101-git-svn-props.sh +++ b/t/t9101-git-svn-props.sh @@ -126,19 +126,20 @@ cat > show-ignore.expect <<\EOF # / /no-such-file* -# deeply +# /deeply/ /deeply/no-such-file* -# deeply/nested +# /deeply/nested/ /deeply/nested/no-such-file* -# deeply/nested/directory +# /deeply/nested/directory/ /deeply/nested/directory/no-such-file* EOF test_expect_success 'test show-ignore' " cd test_wc && mkdir -p deeply/nested/directory && + touch deeply/nested/directory/.keep && svn add deeply && svn up && svn propset -R svn:ignore 'no-such-file*' . @@ -148,4 +149,25 @@ test_expect_success 'test show-ignore' " cmp show-ignore.expect show-ignore.got " +cat >create-ignore.expect <<\EOF +/no-such-file* +EOF + +cat >create-ignore-index.expect <<\EOF +100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 .gitignore +100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 deeply/.gitignore +100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 deeply/nested/.gitignore +100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 deeply/nested/directory/.gitignore +EOF + +test_expect_success 'test create-ignore' " + git-svn fetch && git pull . remotes/git-svn && + git-svn create-ignore && + cmp ./.gitignore create-ignore.expect && + cmp ./deeply/.gitignore create-ignore.expect && + cmp ./deeply/nested/.gitignore create-ignore.expect && + cmp ./deeply/nested/directory/.gitignore create-ignore.expect && + git ls-files -s | grep gitignore | cmp - create-ignore-index.expect + " + test_done -- 1.5.3.4.214.g6f43