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

use getopt in branch()

Browse Source
This commit is contained in:
Josh Holtrop 2012-06-27 09:32:33 -04:00
parent c43a3bd5e9
commit 225db4f5ce
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jsvn
View File

@ -436,12 +436,14 @@ Operations:
return RET_OK return RET_OK
def branch(argv, svn, out): def branch(argv, svn, out):
argv = argv[1:] # strip 'branch' command
options, args = getopt.getopt(argv, 'd')
origin = get_svn_top_level(svn) origin = get_svn_top_level(svn)
root = get_svn_root_url(svn) root = get_svn_root_url(svn)
if origin == '' or root == '': if origin == '' or root == '':
sys.stderr.write("Could not determine origin/root URL\n") sys.stderr.write("Could not determine origin/root URL\n")
return RET_ERR return RET_ERR
if len(argv) < 2: if len(options) == 0 and len(args) == 0:
bl = ['trunk'] + get_svn_branch_list(svn) bl = ['trunk'] + get_svn_branch_list(svn)
current = get_svn_top_level(svn).split('/')[-1] current = get_svn_top_level(svn).split('/')[-1]
bl.sort() bl.sort()
@ -456,10 +458,14 @@ def branch(argv, svn, out):
ansi_reset(out) ansi_reset(out)
out.write('\n') out.write('\n')
return RET_OK return RET_OK
branch_name = argv[-1] if len(args) == 0:
if len(argv) >= 3 and argv[1] == "-d": sys.stderr.write('Error: must supply branch name\n')
# delete branch in argv[2] return RET_ERR
Popen([svn, 'rm', root + '/branches/' + argv[2], '-m', branch_name = args[0]
for opt, val in options:
if opt == '-d':
# delete branch
Popen([svn, 'rm', root + '/branches/' + branch_name, '-m',
"Removed branch '%s'" % branch_name], stdout=out).wait() "Removed branch '%s'" % branch_name], stdout=out).wait()
return RET_OK return RET_OK
comment = "Created '%s' branch" % branch_name comment = "Created '%s' branch" % branch_name