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

colorize diff --summarize output

Browse Source
This commit is contained in:
Josh Holtrop 2012-06-27 12:18:22 -04:00
parent cd5bab7f57
commit 4c470ec5c2
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
jsvn
View File

@ -281,6 +281,26 @@ def filter_update(pout, out):
continue continue
out.write(line) out.write(line)
def filter_status(line, out):
line = line.rstrip()
action = line[0]
prop_action = line[1]
if action == 'A':
ansi_color(out, 'green')
elif action == 'M':
ansi_color(out, 'cyan')
elif action == 'C':
ansi_color(out, 'yellow')
elif action == 'D':
ansi_color(out, 'red')
elif action == 'R':
ansi_color(out, 'magenta')
elif action == ' ' and prop_action == 'M':
ansi_color(out, 'cyan')
out.write(line)
ansi_reset(out)
out.write('\n')
def get_unknowns(svn): def get_unknowns(svn):
unknowns = [] unknowns = []
pout = Popen([svn, 'status'], stdout=PIPE).stdout pout = Popen([svn, 'status'], stdout=PIPE).stdout
@ -734,6 +754,7 @@ def lockable(argv, svn, out):
return RET_OK return RET_OK
def diff(argv, svn, out): def diff(argv, svn, out):
doing_summarize = False
for i, v in enumerate(argv): for i, v in enumerate(argv):
m = re.match('(.*?)(\.\.\.?)(.*)$', v) m = re.match('(.*?)(\.\.\.?)(.*)$', v)
if m is not None: if m is not None:
@ -754,9 +775,13 @@ def diff(argv, svn, out):
return RET_ERR return RET_ERR
url1 += '@%d' % r url1 += '@%d' % r
argv = argv[:i] + [url1, url2] + argv[i + 1:] argv = argv[:i] + [url1, url2] + argv[i + 1:]
break if v == '--summarize':
doing_summarize = True
pout = Popen([svn] + argv, stdout=PIPE).stdout pout = Popen([svn] + argv, stdout=PIPE).stdout
for line in iter(pout.readline, ''): for line in iter(pout.readline, ''):
if doing_summarize:
filter_status(line, out)
else:
colordiff(out, line) colordiff(out, line)
return RET_OK return RET_OK
@ -878,23 +903,7 @@ def status(argv, svn, out):
# look for lines to highlight # look for lines to highlight
if re.match(STATUS_LINE_REGEX, line): if re.match(STATUS_LINE_REGEX, line):
action = line[0] filter_status(line, out)
prop_action = line[1]
if action == 'A':
ansi_color(out, 'green')
elif action == 'M':
ansi_color(out, 'cyan')
elif action == 'C':
ansi_color(out, 'yellow')
elif action == 'D':
ansi_color(out, 'red')
elif action == 'R':
ansi_color(out, 'magenta')
elif action == ' ' and prop_action == 'M':
ansi_color(out, 'cyan')
out.write(line)
ansi_reset(out)
out.write('\n')
something_printed = True something_printed = True
continue continue
out.write(line) out.write(line)