josh/jsvn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove automatically-added svn:executable property from files with certain configurable extensions

Browse Source
This commit is contained in:
Josh Holtrop 2012-07-11 12:40:41 -04:00
parent 33b79e2930
commit e20f843d25
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -131,6 +131,10 @@ Available configuration variables:
function will be called recursively! function will be called recursively!
svn: Specify the path to the native Subversion executable. If not svn: Specify the path to the native Subversion executable. If not
specified, the first 'svn' in $PATH will be used. specified, the first 'svn' in $PATH will be used.
ignore_executable_extensions: A list of extensions (including the '.')
for newly added files which should not automatically have the
svn:executable property added for them even if the files are
executable. The default value is ['.c', '.cc', '.h', '.txt'].
Configuration Examples: Configuration Examples:
pager = 'less -FRXi' # enable case-insensitive searching in less pager = 'less -FRXi' # enable case-insensitive searching in less

30
jsvn
View File

@ -70,6 +70,8 @@ def get_config(svn):
'tags': 'tag', 'tags': 'tag',
'branches': 'branch'}, 'branches': 'branch'},
'svn': '', 'svn': '',
'ignore_executable_extensions':
['.c', '.cc', '.h', '.txt']
} }
global_user_config_fname = os.path.expanduser('~/.jsvn') global_user_config_fname = os.path.expanduser('~/.jsvn')
@ -542,21 +544,37 @@ def find_common_ancestor(svn, url1, path1, url2, path2):
r, path = find_branched_revision(svn, url2, path2, path1) r, path = find_branched_revision(svn, url2, path2, path1)
return r, path return r, path
def filter_add_output(fh, out, svn, config):
for line in iter(fh.readline, ''):
line = line.strip()
m = re.match('A\s+(.*)$', line)
if m is not None:
path = m.group(1)
for ext in config['ignore_executable_extensions']:
if path.endswith(ext):
del_svn_property(svn, 'svn:executable', path)
out.write(line)
out.write('\n')
########################################################################### ###########################################################################
# Subcommand Handlers # # Subcommand Handlers #
########################################################################### ###########################################################################
def add_h(argv, svn, out, config): def add_h(argv, svn, out, config):
if len(argv) < 2: argv = argv[1:] # strip off 'add'
if len(argv) == 0:
# do not handle if no targets are passed # do not handle if no targets are passed
# no output filtering needed since nothing will be added
return RET_REEXEC return RET_REEXEC
if len(filter(lambda x: x.startswith('-'), argv)) != 0: if len(filter(lambda x: x.startswith('-'), argv)) != 0:
# do not handle if any options are passed # do not handle if any options are passed
return RET_REEXEC p = Popen([svn, 'add'] + argv, stdout=PIPE)
filter_add_output(p.stdout, out, svn, config)
return RET_OK
# for each target specified, check if there are unversioned items # for each target specified, check if there are unversioned items
# underneath it (for directories) and add them as well # underneath it (for directories) and add them as well
# if none are found, fall back to the native svn add # if none are found, fall back to the native svn add
unknowns = get_unknowns(svn) unknowns = get_unknowns(svn)
for path in argv[1:]: for path in argv:
if path == '.': if path == '.':
path = os.getcwd() path = os.getcwd()
if path.endswith('/'): if path.endswith('/'):
@ -564,10 +582,12 @@ def add_h(argv, svn, out, config):
found_one = False found_one = False
for u in unknowns: for u in unknowns:
if descendant_path(u, path): if descendant_path(u, path):
Popen([svn, 'add', u], stdout=out).wait() p = Popen([svn, 'add', u], stdout=PIPE)
filter_add_output(p.stdout, out, svn, config)
found_one = True found_one = True
if not found_one: if not found_one:
Popen([svn, 'add', path], stdout=out).wait() p = Popen([svn, 'add', path], stdout=PIPE)
filter_add_output(p.stdout, out, svn, config)
return RET_OK return RET_OK
def bisect_h(argv, svn, out, config): def bisect_h(argv, svn, out, config):