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

update "add" to be aware of "ignore_symlinks"

Browse Source
This commit is contained in:
Josh Holtrop 2015-03-11 15:18:51 -04:00
parent 3107b78aa0
commit 40b987911c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jsvn
View File

@ -462,13 +462,14 @@ def filter_status(line, out):
ansi_reset(out) ansi_reset(out)
out.write('\n') out.write('\n')
def get_unknowns(svn): def get_unknowns(svn, config):
unknowns = [] unknowns = []
pout = Popen([svn, 'status'], stdout=PIPE).stdout pout = Popen([svn, 'status'], stdout=PIPE).stdout
for line in iter(pout.readline, ''): for line in iter(pout.readline, ''):
m = re.match(r'\? (.*)$', line) m = re.match(r'\? (.*)$', line)
if m is not None: 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 return unknowns
def descendant_path(child, parent): 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 # 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, config)
for path in argv: for path in argv:
if path == '.': if path == '.':
path = os.getcwd() path = os.getcwd()