git-svn: Support for git-svn propset
PATCH 1/1 git-svn: Support for git-svn propset
This change allows git-svn to support setting subversion properties.
Very useful for manually setting properties when committing to a subversion repo that *requires* properties to be set without requiring moving your changeset to separate subversion checkout in order to set props.
This change is initially from David Fraser <davidf () sjsoft ! com> Appearing here: http://marc.info/?l=git&m=125259772625008&w=2
They are now forward ported to most recent git along with fixes to deal with files in subdirectories.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
(b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
(c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
(d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.
--- git-svn.perl | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- perl/Git/SVN/Editor.pm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-)
git-svn.perl +49 -1
@@ -115,7 +115,7 @@ my ($_stdin, $_help, $_edit, $_before, $_after, $_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local, $_prefix, $_no_checkout, $_url, $_verbose, - $_commit_url, $_tag, $_merge_info, $_interactive); + $_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props); # This is a refactoring artifact so Git::SVN can get at this git-svn switch. sub opt_prefix { return $_prefix || '' }
@@ -193,6 +193,7 @@ my %cmd = ( 'dry-run|n' => \$_dry_run, 'fetch-all|all' => \$_fetch_all, 'commit-url=s' => \$_commit_url, + 'set-svn-props=s' => \$_set_svn_props, 'revision|r=i' => \$_revision, 'no-rebase' => \$_no_rebase, 'mergeinfo=s' => \$_merge_info,
@@ -228,6 +229,9 @@ my %cmd = ( 'propget' => [ \&cmd_propget, 'Print the value of a property on a file or directory', { 'revision|r=i' => \$_revision } ], + 'propset' => [ \&cmd_propset, + 'Set the value of a property on a file or directory - will be set on commit', + {} ], 'proplist' => [ \&cmd_proplist, 'List all properties of a file or directory', { 'revision|r=i' => \$_revision } ],
@@ -1376,6 +1380,50 @@ sub cmd_propget { print $props->{$prop} . "\n"; } +# cmd_propset (PROPNAME, PROPVAL, PATH) +# ------------------------ +# Adjust the SVN property PROPNAME to PROPVAL for PATH. +sub cmd_propset { + my ($propname, $propval, $path) = @_; + $path = '.' if not defined $path; + $path = $cmd_dir_prefix . $path; + usage(1) if not defined $propname; + usage(1) if not defined $propval; + my $file = basename($path); + my $dn = dirname($path); + # diff has check_attr locally, so just call direct + #my $current_properties = check_attr( "svn-properties", $path ); + my $current_properties = Git::SVN::Editor::check_attr( "svn-properties", $path ); + my $new_properties = ""; + if ($current_properties eq "unset" || $current_properties eq "" || $current_properties eq "set") { + $new_properties = "$propname=$propval"; + } else { + # TODO: handle combining properties better + my @props = split(/;/, $current_properties); + my $replaced_prop = 0; + foreach my $prop (@props) { + # Parse 'name=value' syntax and set the property. + if ($prop =~ /([^=]+)=(.*)/) { + my ($n,$v) = ($1,$2); + if ($n eq $propname) + { + $v = $propval; + $replaced_prop = 1; + } + if ($new_properties eq "") { $new_properties="$n=$v"; } + else { $new_properties="$new_properties;$n=$v"; } + } + } + if ($replaced_prop eq 0) { + $new_properties = "$new_properties;$propname=$propval"; + } + } + my $attrfile = "$dn/.gitattributes"; + open my $attrfh, '>>', $attrfile or die "Can't open $attrfile: $!\n"; + # TODO: don't simply append here if $file already has svn-properties + print $attrfh "$file svn-properties=$new_properties\n"; +} + # cmd_proplist (PATH) # ------------------- # Print the list of SVN properties for PATH.
perl/Git/SVN/Editor.pm +47 -0
77 lines not on this page · raw message
Signature · 1 line
2.1.2
Quoted 6 lines · Alfred Perlstein
This change allows git-svn to support setting subversion properties.
Very useful for manually setting properties when committing to a subversion repo that *requires* properties to be set without requiring moving your changeset to separate subversion checkout in order to set props.
Thanks Alfred, that's a good reason for supporting this feature (something I wasn't convinced of with the original).
Quoted 2 lines
This change is initially from David Fraser <davidf () sjsoft ! com> Appearing here: http://marc.info/?l=git&m=125259772625008&w=2
I've added David to the Cc: (but I never heard back from him regarding comments from his original patch).
Alfred: I had some comments on David's original patch here that were never addressed:
http://mid.gmane.org/[email protected]
I suspect my concerns about .gitattributes in the source tree from 2009 are less relevant now in 2014 as git-svn seems more socially acceptable in SVN-using projects.
Some of my other concerns about mimicking existing Perl style still apply, and we have a Perl section in Documenting/CodingGuidelines nowadays.
Quoted 4 lines
They are now forward ported to most recent git along with fixes to deal with files in subdirectories.
Developer's Certificate of Origin 1.1
<snip> no need for the whole DCO in the commit message. just the S-o-b:
Quoted 1 line
Signed-off-by Alfred Perlstein <[email protected]>
Since this was originally written by David, his sign-off from the original email should be here (Cc: for bigger changes)
Quoted 3 lines
--- git-svn.perl | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- perl/Git/SVN/Editor.pm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
We need a test case written for this new feature.
Most folks (including myself) who were ever involved with git-svn rarely use it anymore, and this will likely be rarely-used.
Quoted 40 lines
2 files changed, 96 insertions(+), 1 deletion(-)git-svn.perl +8
-1@@ -115,7 +115,7 @@ my ($_stdin, $_help, $_edit, $_before, $_after, $_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local, $_prefix, $_no_checkout, $_url, $_verbose, - $_commit_url, $_tag, $_merge_info, $_interactive); + $_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props); # This is a refactoring artifact so Git::SVN can get at this git-svn switch. sub opt_prefix { return $_prefix || '' }@@ -193,6 +193,7 @@ my %cmd = ( 'dry-run|n' => \$_dry_run, 'fetch-all|all' => \$_fetch_all, 'commit-url=s' => \$_commit_url, + 'set-svn-props=s' => \$_set_svn_props, 'revision|r=i' => \$_revision, 'no-rebase' => \$_no_rebase, 'mergeinfo=s' => \$_merge_info,@@ -228,6 +229,9 @@ my %cmd = ( 'propget' => [ \&cmd_propget, 'Print the value of a property on a file or directory', { 'revision|r=i' => \$_revision } ], + 'propset' => [ \&cmd_propset, + 'Set the value of a property on a file or directory - will be set on commit', + {} ], 'proplist' => [ \&cmd_proplist, 'List all properties of a file or directory', { 'revision|r=i' => \$_revision } ],@@ -1376,6 +1380,50 @@ sub cmd_propget { print $props->{$prop} . "\n"; } +# cmd_propset (PROPNAME, PROPVAL, PATH) +# ------------------------ +# Adjust the SVN property PROPNAME to PROPVAL for PATH.
git-svn.perl sub cmd_propget { · line 1395
Quoted 10 lines
git-svn.perl +10
-0+sub cmd_propset { + my ($propname, $propval, $path) = @_; + $path = '.' if not defined $path; + $path = $cmd_dir_prefix . $path; + usage(1) if not defined $propname; + usage(1) if not defined $propval; + my $file = basename($path); + my $dn = dirname($path); + # diff has check_attr locally, so just call direct + #my $current_properties = check_attr( "svn-properties", $path );
I prefer leaving out dead code entirely instead of leaving it commented out.
git-svn.perl sub cmd_propget { · line 1397
Quoted 2 lines
git-svn.perl +2
-0+ my $current_properties = Git::SVN::Editor::check_attr( "svn-properties", $path ); + my $new_properties = "";
Since some lines are too long, local variables can be shortened to cur_props, new_props without being any less descriptive.
Quoted 10 lines
git-svn.perl +10
-0+ if ($current_properties eq "unset" || $current_properties eq "" || $current_properties eq "set") { + $new_properties = "$propname=$propval"; + } else { + # TODO: handle combining properties better + my @props = split(/;/, $current_properties); + my $replaced_prop = 0; + foreach my $prop (@props) { + # Parse 'name=value' syntax and set the property. + if ($prop =~ /([^=]+)=(.*)/) { + my ($n,$v) = ($1,$2);
git-svn.perl sub cmd_propget { · line 1417
Quoted 10 lines
git-svn.perl +10
-0+ if ($n eq $propname) + { + $v = $propval; + $replaced_prop = 1; + } + if ($new_properties eq "") { $new_properties="$n=$v"; } + else { $new_properties="$new_properties;$n=$v"; } + } + } + if ($replaced_prop eq 0) {
Generally, == is favored for numeric comparisons
(but this is boolean)
git-svn.perl sub cmd_propget { · line 1424
Quoted 7 lines
git-svn.perl +7
-0+ $new_properties = "$new_properties;$propname=$propval"; + } + } + my $attrfile = "$dn/.gitattributes"; + open my $attrfh, '>>', $attrfile or die "Can't open $attrfile: $!\n"; + # TODO: don't simply append here if $file already has svn-properties + print $attrfh "$file svn-properties=$new_properties\n";
Would be good to have an explicit close and error checking on it in case of FS errors
Quoted 10 lines
git-svn.perl +2
-0+} + # cmd_proplist (PATH) # ------------------- # Print the list of SVN properties for PATH.perl/Git/SVN/Editor.pm +0
-0
perl/Git/SVN/Editor.pm sub apply_autoprops { · line 294
Quoted 7 lines
perl/Git/SVN/Editor.pm +4
-0@@ -288,6 +288,49 @@ sub apply_autoprops { } } +sub check_attr +{ + my ($attr,$path) = @_; + if ( open my $fh, '-|', "git", "check-attr", $attr, "--", $path )
Use Git.pm (command_output_pipe) for running git commands portably. (And formatting for this sub alone is really off).
Quoted 19 lines
perl/Git/SVN/Editor.pm +19
-0+ { + my $val = <$fh>; + close $fh; + $val =~ s/^[^:]*:\s*[^:]*:\s*(.*)\s*$/$1/; + return $val; + } + else + { + return undef; + } +} + +sub apply_manualprops { + my ($self, $file, $fbat) = @_; + my $pending_properties = check_attr( "svn-properties", $file ); + if ($pending_properties eq "") { return; } + # Parse the list of properties to set. + my @props = split(/;/, $pending_properties); + # TODO: get existing properties to compare to - this fails for add so currently not done
perl/Git/SVN/Editor.pm sub apply_autoprops { · line 323
Quoted 10 lines
perl/Git/SVN/Editor.pm +10
-0+ # my $existing_props = ::get_svnprops($file); + my $existing_props = {}; + # TODO: caching svn properties or storing them in .gitattributes would make that faster + foreach my $prop (@props) { + # Parse 'name=value' syntax and set the property. + if ($prop =~ /([^=]+)=(.*)/) { + my ($n,$v) = ($1,$2); + for ($n, $v) { + s/^\s+//; s/\s+$//; + }
I'd probably rewrite the following hunk:
perl/Git/SVN/Editor.pm sub apply_autoprops { · line 329
Quoted 6 lines
perl/Git/SVN/Editor.pm +6
-0+ # FIXME: clearly I don't know perl and couldn't work out how to evaluate this better + if (defined $existing_props->{$n} && $existing_props->{$n} eq $v) { + my $needed = 0; + } else { + $self->change_file_prop($fbat, $n, $v); + }
as:
my $existing = $existing_props->{$n};
if (!defined($existing) || $existing ne $v) {
$self->change_file_prop($fbat, $n, $v);
}No need for setting $needed = 0 from what I can tell.
Rest of the patch looks fine.
Thank you again for bringing this up and I look forward to a reroll of this with my comments addressed (maybe wait a few days for others to comment, holidays and all).