On Tue, Nov 20, 2012 at 10:14 PM, Paul Burba <ptburba_at_gmail.com> wrote:
> On Mon, Nov 19, 2012 at 5:27 PM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:
...
>> Maybe the output should become something like:
>>
>> Properties on 'A\B' inherited from
>> 'C:\SVN\src-trunk-2\Debug\subversion\tests\cmdline\svn-test-work\working_copies\autoprop_tests-30':
>> svn:auto-props
>> Properties on 'A\B':
>> svn:auto-props
>> svn:global-ignores
>>
>> ?
>
> ...so something like your proceeding suggestion would be helpful. I
> made such a change in r1411831 except I tweaked your wording just a
> bit so the line starts with "Inherited properties on" rather than
> "Properties on 'path'". I think this makes it clearer at a glance
> when we are dealing with inherited vs. explicit properties. For
> example:
>
>>svn pl --show-inherited-props B\Y\bar.c
> Inherited properties on 'B\Y\bar.c',
> from 'file:///C:/SVN/src-trunk/Debug/subversion/tests/cmdline/svn-test-work/repositories/autoprop_tests-30':
> svn:auto-props
> Inherited properties on 'B\Y\bar.c',
> from 'C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\working_copies\autoprop_tests-30':
> svn:auto-props
> Inherited properties on 'B\Y\bar.c',
> from 'C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\working_copies\autoprop_tests-30\B':
> svn:auto-props
> Properties on 'B\Y\bar.c':
> svn:eol-style
>
>>svn pl --show-inherited-props B\Y\bar.c -v
> Inherited properties on 'B\Y\bar.c',
> from 'file:///C:/SVN/src-trunk/Debug/subversion/tests/cmdline/svn-test-work/repositories/autoprop_tests-30':
> svn:auto-props
> *.h=svn:eol-style=native
>
> Inherited properties on 'B\Y\bar.c',
> from 'C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\working_copies\autoprop_tests-30':
> svn:auto-props
> *.py=svn:eol-style=native
> *.c=svn:eol-style=native
> *.h=svn:eol-style=native
>
> Inherited properties on 'B\Y\bar.c',
> from 'C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\working_copies\autoprop_tests-30\B':
> svn:auto-props
> *.c=svn:eol-style=CR
> *.h=svn:eol-style=CR
> *.py=svn:eol-style=CR
>
> Properties on 'B\Y\bar.c':
> svn:eol-style
> CR
>
>
> (Yes, we can bikeshed this as necessary :-)
That looks great to me, I like the color of that bikeshed :-). Thanks.
>
>> The same applies to propget.
>
> I assume you are speaking only of 'svn pg -v' here?
Yep.
> As you point out
> the limitations of 'svn pg' sans -v below. As part of r1411830 I also
> tweaked the 'svn pg -v' output ...
Perfect.
...
>> Note that this output (without -v) changes when there are multiple targets:
>>
>>>svn pg svn:auto-props A/B C/D
>> A/B - *.c=svn:eol-style=native
>> *.h=svn:eol-style=native
>>
>> C/D - *.py=svn:eol-style=native
>> *.pl=svn:eol-style=native
>>
>>
>> Or with a single-line prop:
>>
>>>svn pg svn:eol-style foo.txt bar.txt
>> foo.txt - native
>> bar.txt - native
>>
>>
>> This output isn't exactly great (not parseable for multiline props),
>> but it's okay for single-line props.
>>
>> In any case, we should also
>> define what this (multi-arg but without -v) looks like in the case of
>> 'svnlook pg'.
>
> Just to be clear, I'm *not* planning on tackling multi-target support
> for 'svnlook pg|pl'. I was only proposing that the output in the
> single target case mimic that of 'svn pg|pl'.
Okay, got it.
> I agree, the non-verbose output for 'svn pg' isn't very useful in some
> circumstances, not just multi-line props, but also with the multiple
> targets with the --show-inherited-props option, particularly when (as
> you pointed out above for 'svn pg') the targets themselves don't have
> explicit properties. But we have easy workarounds: --xml and -v. As
> for 'svnlook pg', soon it will have the --verbose option. Perhaps
> that is sufficient?
Yes, it certainly is.
And if I would ever get around to multi-target support I can always
mimic 'svn pg' for this.
--
Johan
Received on 2012-11-20 22:34:04 CET