You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by kf...@collab.net on 2006/03/15 18:53:17 UTC
Re: Some contrib stuff
Wilfredo Sánchez Vega <ws...@wsanchez.net> writes:
> I've got some scripts to submit to the contrib/ folder, if y'all
> want them:
>
> svn-apply-autoprops:
>
> http://svn.red-bean.com/wsanchez/trunk/svn-support/svn-apply-
> autoprops
>
> I think this does the same stuff as the svn-apply-autoprops.py
> that's already there, except:
Note: current one is "svn_apply_autoprops.py", that is, underscores
and a ".py" ending, contrasted with your "svn-apply-autoprops".
> - it uses python's ConfigParser module rather than implementing
> it's own
> - it's BSD licensed instead of GPL
> - has some options:
> - "dry run" mode
> - choose an alternative config file
> - clear properties if not in config or if empty in config
In view of the increased functionality and use of ConfigParser, I'd be
okay with replacing the current one with this new one, but it would be
nice to get Blair Zajac's thoughts on that first (just a courtesy
ping, if nothing else, since he wrote the original). I've CC'd him on
this mail. Blair?
> svn-viewdiff:
>
> http://svn.red-bean.com/wsanchez/trunk/svn-support/svn-viewdiff
>
> View diffs using FileMerge (OS X). You can use FileMerge to undo
> specific changes in the wc. (I find it useful for quickly removing
> debug code before commits.)
I don't think the "--help" option on that one is quite working:
$ ls -l ~/etc/svn-viewdiff
-rwxr-xr-x 1 kfogel kfogel 4515 Mar 15 15:21 /home/kfogel/etc/svn-viewdiff*
$ head ~/etc/svn-viewdiff
#!/bin/sh
# -*- coding:utf-8;mode:shell-script;mode:font-lock -*-
##
# GNU diff wrapper for FileMerge.
##
# Copyright (c) 2002 Wilfredo Sanchez Vega <ws...@wsanchez.net>.
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for any
$ ~/etc/svn-viewdiff
diff: missing operand after `diff'
diff: Try `diff --help' for more information.
[Hmm, that error message is from diff itself, not your script!]
$ ~/etc/svn-viewdiff --help
Usage: diff [OPTION]... FILES
Compare files line by line.
[...rest of help for GNU 'diff' here...]
Report bugs to <bu...@gnu.org>.
$
Urgk?
> svn-resolve:
>
> http://svn.red-bean.com/wsanchez/trunk/svn-support/svn-resolve
>
> Resolve merge conflicts using FileMerge (OS X).
This one has no online help, beyond the line quoted above.
Documentation is especially important in contrib/ scripts, where
people often just browse around seeing if what they need is there.
> enforcer:
>
> http://svn.red-bean.com/wsanchez/trunk/svn-support/enforcer
>
> This is a pre-commit hook script. It lets you specify some
> enforcement rules on commits at the diff level.
>
> Meaning, you can disallow a commit because it added a line of code
> you don't like, but not because the file already has an offending
> line (eg. don't make it worse).
>
> Or you can fail a commit because it didn't clean up junk in a file
> it edited, if that's your style.
>
> Bunch of other stuff if you get creative. You'll want to read the
> __doc__ string in the script and look at the example config file if
> you want ore details.
Nice documentation! Suggest renaming 'enforcer.conf' to
EXAMPLE-enforcer.conf or something similar, though.
I'm +1 on your maintaining all these in contrib/, if you can make them
all self-documenting.
Thanks,
-Karl
--
www.collab.net <> CollabNet | Distributed Development On Demand
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Some contrib stuff
Posted by kf...@collab.net.
Wilfredo Sánchez Vega <ws...@wsanchez.net> writes:
> On Mar 15, 2006, at 10:53 AM, kfogel@collab.net wrote:
> > Wilfredo Sánchez Vega <ws...@wsanchez.net> writes:
> >
> > In view of the increased functionality and use of ConfigParser, I'd be
> > okay with replacing the current one with this new one, but it would be
> > nice to get Blair Zajac's thoughts on that first (just a courtesy
> > ping, if nothing else, since he wrote the original). I've CC'd him on
> > this mail. Blair?
>
> For what it's worth (not that it changes whether we should ask
> Blair for feedback), mine's not a derivative; I didn't know there was
> another script with a very similar name until I noticed it today.
Oh, I didn't mean to imply that you knew, sorry if it came out that
way.
> Weird:
>
> wsanchez% ./svn-viewdiff --help
> svn-viewdiff: usage:
> svn-viewdiff [options] file1 file2
>
> options:
> --help Print this help
> -c Ignored
> -C --context X Ignored
> -u Ignored
> -U --unified X Ignored
> -L --label X Ignored
> -q --brief Ignored
> -y --side-by-side Ignored
> -w --width X Ignored
> -l --paginate Ignored
> -t --expand-tabs Ignored
> -T --initial-tab Ignored
> -d --minimal Ignored
> -H --speed-large-files Ignored
>
> I'll see if I can figure out what's going on there.
Wow, that's odd. Thanks for investigating...
-Karl
--
www.collab.net <> CollabNet | Distributed Development On Demand
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Some contrib stuff
Posted by Wilfredo Sánchez Vega <ws...@wsanchez.net>.
On Mar 15, 2006, at 10:53 AM, kfogel@collab.net wrote:
> Wilfredo Sánchez Vega <ws...@wsanchez.net> writes:
>
> In view of the increased functionality and use of ConfigParser, I'd be
> okay with replacing the current one with this new one, but it would be
> nice to get Blair Zajac's thoughts on that first (just a courtesy
> ping, if nothing else, since he wrote the original). I've CC'd him on
> this mail. Blair?
For what it's worth (not that it changes whether we should ask
Blair for feedback), mine's not a derivative; I didn't know there was
another script with a very similar name until I noticed it today.
> I don't think the "--help" option on that one is quite working:
>
> $ ~/etc/svn-viewdiff
> diff: missing operand after `diff'
> diff: Try `diff --help' for more information.
>
> [Hmm, that error message is from diff itself, not your script!]
Weird:
wsanchez% ./svn-viewdiff --help
svn-viewdiff: usage:
svn-viewdiff [options] file1 file2
options:
--help Print this help
-c Ignored
-C --context X Ignored
-u Ignored
-U --unified X Ignored
-L --label X Ignored
-q --brief Ignored
-y --side-by-side Ignored
-w --width X Ignored
-l --paginate Ignored
-t --expand-tabs Ignored
-T --initial-tab Ignored
-d --minimal Ignored
-H --speed-large-files Ignored
I'll see if I can figure out what's going on there.
>> svn-resolve:
>>
>> http://svn.red-bean.com/wsanchez/trunk/svn-support/svn-resolve
>>
>> Resolve merge conflicts using FileMerge (OS X).
>
> This one has no online help, beyond the line quoted above.
> Documentation is especially important in contrib/ scripts, where
> people often just browse around seeing if what they need is there.
I can fix that up.
>> enforcer:
>
> Nice documentation! Suggest renaming 'enforcer.conf' to
> EXAMPLE-enforcer.conf or something similar, though.
Thanks. In that case, it was pretty necessary. Hard to explain
that one in a one-liner. :-)
> I'm +1 on your maintaining all these in contrib/, if you can make them
> all self-documenting.
Docs: no problem; I agree.
-wsv
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Some contrib stuff
Posted by Blair Zajac <bl...@orcaware.com>.
On Mar 16, 2006, at 4:31 AM, Julian Foad wrote:
> Blair Zajac wrote:
>>>>
>>>> http://svn.red-bean.com/wsanchez/trunk/svn-support/svn-apply-
>>>> autoprops
> [...]
>> I am unable to download this file from two hosts on two totally
>> separate networks.
>
> Did you notice the URL was split across two lines? If that wasn't
> the problem, in what way did it fail?
Of course I noticed the split :)
It never connected. However, it is working fine now.
Regards,
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Some contrib stuff
Posted by Julian Foad <ju...@btopenworld.com>.
Blair Zajac wrote:
>>>
>>> http://svn.red-bean.com/wsanchez/trunk/svn-support/svn-apply-
>>> autoprops
[...]
> I am unable to download this file from two hosts on two totally separate
> networks.
Did you notice the URL was split across two lines? If that wasn't the problem,
in what way did it fail?
I could see it fine when first posted, and again just now, at this URL:
<http://svn.red-bean.com/wsanchez/trunk/svn-support/svn-apply-autoprops>
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Some contrib stuff
Posted by Blair Zajac <bl...@orcaware.com>.
kfogel@collab.net wrote:
> Wilfredo Sánchez Vega <ws...@wsanchez.net> writes:
>
>> I've got some scripts to submit to the contrib/ folder, if y'all
>>want them:
>>
>>svn-apply-autoprops:
>>
>> http://svn.red-bean.com/wsanchez/trunk/svn-support/svn-apply-
>>autoprops
>>
>> I think this does the same stuff as the svn-apply-autoprops.py
>>that's already there, except:
>
>
> Note: current one is "svn_apply_autoprops.py", that is, underscores
> and a ".py" ending, contrasted with your "svn-apply-autoprops".
>
>
>> - it uses python's ConfigParser module rather than implementing
>>it's own
>> - it's BSD licensed instead of GPL
>> - has some options:
>> - "dry run" mode
>> - choose an alternative config file
>> - clear properties if not in config or if empty in config
>
>
> In view of the increased functionality and use of ConfigParser, I'd be
> okay with replacing the current one with this new one, but it would be
> nice to get Blair Zajac's thoughts on that first (just a courtesy
> ping, if nothing else, since he wrote the original). I've CC'd him on
> this mail. Blair?
<reminisce>
Oh the days when somebody would write something in Perl and somebody else in
Python and we could have two copies of the same script in our repository. Now
that nobody cares about Perl, I'll have to write Ruby scripts :)
</reminisce>
I am unable to download this file from two hosts on two totally separate networks.
Let me take a look at the new one and do a review of it.
Regards,
Blair
--
Blair Zajac, Ph.D.
<bl...@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org