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

unmodified directory and file externals do not cause a containing external to be shown

Browse Source
This commit is contained in:
Josh Holtrop 2012-06-05 15:55:07 -04:00
parent bbe6d71a0a
commit 31dcb06078
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jsvn
View File

@ -754,12 +754,22 @@ def status(argv, svn, out):
if re.match(r'\s*$', line): if re.match(r'\s*$', line):
continue continue
# look for lines that should be ignored
if re.match(STATUS_LINE_REGEX, line):
action = line[0]
if action == 'X':
continue # don't print directory externals
elif line.startswith(' X '):
continue # don't print unmodified file externals
# anything not matched yet will cause an external to be shown # anything not matched yet will cause an external to be shown
if not external_printed: if not external_printed:
if something_printed: if something_printed:
out.write('\n') out.write('\n')
out.write("External '%s':\n" % external) out.write("External '%s':\n" % external)
external_printed = True external_printed = True
# look for lines to highlight
if re.match(STATUS_LINE_REGEX, line): if re.match(STATUS_LINE_REGEX, line):
action = line[0] action = line[0]
prop_action = line[1] prop_action = line[1]
@ -775,8 +785,6 @@ def status(argv, svn, out):
ansi_color(out, 'magenta') ansi_color(out, 'magenta')
elif action == ' ' and prop_action == 'M': elif action == ' ' and prop_action == 'M':
ansi_color(out, 'cyan') ansi_color(out, 'cyan')
elif action == 'X':
continue # don't print externals
out.write(line) out.write(line)
ansi_reset(out) ansi_reset(out)
out.write('\n') out.write('\n')