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

jsvn: restore empty line before final line if any external was printed

Browse Source
This commit is contained in:
Josh Holtrop 2012-02-21 16:48:01 -05:00
parent 768c92f78a
commit e7787a65cb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jsvn
View File

@ -475,6 +475,7 @@ def log(argv, svn, out):
def update(argv, svn, out): def update(argv, svn, out):
external = '' external = ''
external_printed = True external_printed = True
any_external_printed = False
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, ''):
m = re.match(r"Fetching external item into '(.*)':", line) m = re.match(r"Fetching external item into '(.*)':", line)
@ -489,7 +490,7 @@ def update(argv, svn, out):
out.write(line) out.write(line)
continue continue
if re.match(r'(Updated.to|At) revision', line): if re.match(r'(Updated.to|At) revision', line):
if external_printed: if any_external_printed:
out.write('\n') out.write('\n')
out.write(line) out.write(line)
continue continue
@ -498,6 +499,7 @@ def update(argv, svn, out):
if not external_printed: if not external_printed:
out.write("\nExternal '%s':\n" % external) out.write("\nExternal '%s':\n" % external)
external_printed = True external_printed = True
any_external_printed = True
if re.match(r'[ADUCGER ]{2}[B ][C ] ', line): if re.match(r'[ADUCGER ]{2}[B ][C ] ', line):
action = line[0] action = line[0]
if action == 'A': if action == 'A':