From 40b987911c327f03b97d31c092436313716894ab Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 11 Mar 2015 15:18:51 -0400 Subject: [PATCH] update "add" to be aware of "ignore_symlinks" --- jsvn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jsvn b/jsvn index 4d105b3..eac41a2 100755 --- a/jsvn +++ b/jsvn @@ -462,13 +462,14 @@ def filter_status(line, out): ansi_reset(out) out.write('\n') -def get_unknowns(svn): +def get_unknowns(svn, config): unknowns = [] pout = Popen([svn, 'status'], stdout=PIPE).stdout for line in iter(pout.readline, ''): m = re.match(r'\? (.*)$', line) if m is not None: - unknowns.append(m.group(1)) + if not (config['ignore_symlinks'] and os.path.islink(m.group(1))): + unknowns.append(m.group(1)) return unknowns def descendant_path(child, parent): @@ -593,7 +594,7 @@ def add_h(argv, svn, out, config): # for each target specified, check if there are unversioned items # underneath it (for directories) and add them as well # if none are found, fall back to the native svn add - unknowns = get_unknowns(svn) + unknowns = get_unknowns(svn, config) for path in argv: if path == '.': path = os.getcwd()