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

allow ctrl+c to interrupt watch-lock without printing a python stack dump

Browse Source
This commit is contained in:
Josh Holtrop 2012-05-23 15:36:09 -04:00
parent 55eee0d6ac
commit bbe6d71a0a
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jsvn
View File

@ -568,23 +568,23 @@ def watch_lock(argv, svn, out):
break break
last_lock_owner = '' last_lock_owner = ''
while True: try:
lock_owner = '' while True:
p = Popen([svn, 'info', path], stdout=PIPE) lock_owner = ''
lines = p.communicate()[0].split('\n') p = Popen([svn, 'info', path], stdout=PIPE)
for line in lines: lines = p.communicate()[0].split('\n')
m = re.match(r'Lock\sOwner:\s*(.*)', line) for line in lines:
if m is not None: m = re.match(r'Lock\sOwner:\s*(.*)', line)
lock_owner = m.group(1) if m is not None:
lock_owner = m.group(1)
break
if lock_owner == '':
break break
if lock_owner == '': if lock_owner != last_lock_owner:
break out.write('Locked by: %s\n' % lock_owner)
if lock_owner != last_lock_owner: last_lock_owner = lock_owner
out.write('Locked by: %s\n' % lock_owner) time.sleep(60)
last_lock_owner = lock_owner out.write('''
time.sleep(60)
out.write('''
_ _ _ _ _ _ _ _ _ _ _ _
| | | |_ __ | | ___ ___| | _____ __| | | | | | |_ __ | | ___ ___| | _____ __| | |
| | | | '_ \| |/ _ \ / __| |/ / _ \/ _` | | | | | | '_ \| |/ _ \ / __| |/ / _ \/ _` | |
@ -592,6 +592,8 @@ def watch_lock(argv, svn, out):
\___/|_| |_|_|\___/ \___|_|\_\___|\__,_(_) \___/|_| |_|_|\___/ \___|_|\_\___|\__,_(_)
''') ''')
except KeyboardInterrupt:
pass
return RET_OK return RET_OK
def users(argv, svn, out): def users(argv, svn, out):