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

jsvn: error out on branch/tag list commands if repository structure is not valid

Browse Source
This commit is contained in:
Josh Holtrop 2012-03-08 11:01:31 -05:00
parent 04482e4adc
commit f110815bbe
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jsvn
View File

@ -355,6 +355,11 @@ def add(argv, svn, out):
return RET_OK return RET_OK
def branch(argv, svn, out): def branch(argv, svn, out):
origin = getSVNTopLevel(svn)
root = getSVNRoot(svn)
if origin == '' or root == '':
sys.stderr.write("Could not determine origin/root URL\n")
return RET_ERR
if len(argv) < 2: if len(argv) < 2:
bl = ['trunk'] + getSVNBranchList(svn) bl = ['trunk'] + getSVNBranchList(svn)
current = getSVNTopLevel(svn).split('/')[-1] current = getSVNTopLevel(svn).split('/')[-1]
@ -370,22 +375,22 @@ def branch(argv, svn, out):
ansi_reset(out) ansi_reset(out)
return RET_OK return RET_OK
branch_name = argv[-1] branch_name = argv[-1]
origin = getSVNTopLevel(svn)
root = getSVNRoot(svn)
if len(argv) >= 3 and argv[1] == "-d": if len(argv) >= 3 and argv[1] == "-d":
# delete branch in argv[2] # delete branch in argv[2]
Popen([svn, 'rm', root + '/branches/' + argv[2], '-m', Popen([svn, 'rm', root + '/branches/' + argv[2], '-m',
"Removed branch '%s'" % branch_name], stdout=out).wait() "Removed branch '%s'" % branch_name], stdout=out).wait()
return RET_OK return RET_OK
if origin == '' or root == '':
sys.stderr.write("Could not determine origin/root URL\n")
return RET_ERR
comment = "Created '%s' branch" % branch_name comment = "Created '%s' branch" % branch_name
branch_path = root + '/branches/' + branch_name branch_path = root + '/branches/' + branch_name
Popen([svn, 'copy', origin, branch_path, '-m', comment], stdout=out).wait() Popen([svn, 'copy', origin, branch_path, '-m', comment], stdout=out).wait()
return RET_OK return RET_OK
def tag(argv, svn, out): def tag(argv, svn, out):
origin = getSVNTopLevel(svn)
root = getSVNRoot(svn)
if origin == '' or root == '':
sys.stderr.write("Could not determine origin/root URL\n")
return RET_ERR
tl = getSVNTagList(svn) tl = getSVNTagList(svn)
if len(argv) < 2: if len(argv) < 2:
tl.sort() tl.sort()
@ -393,11 +398,6 @@ def tag(argv, svn, out):
out.write(t + '\n') out.write(t + '\n')
return RET_OK return RET_OK
tag_name = argv[-1] tag_name = argv[-1]
origin = getSVNTopLevel(svn)
root = getSVNRoot(svn)
if origin == '' or root == '':
sys.stderr.write("Could not determine origin/root URL\n")
return RET_ERR
if len(argv) == 4 and argv[1] == '-m': if len(argv) == 4 and argv[1] == '-m':
old_tag_name = argv[2] old_tag_name = argv[2]
if not old_tag_name in tl: if not old_tag_name in tl: