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

jsvn: move URL printout into switch()

Browse Source
This commit is contained in:
Josh Holtrop 2011-10-24 22:54:33 -04:00
parent 230fb1ccf0
commit 3d903ae14f
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jsvn
View File

@ -177,18 +177,27 @@ def tag(argv, svn):
def switch(argv, svn): def switch(argv, svn):
if len(argv) < 2: if len(argv) < 2:
return -1 return -1
switched = False
root = getSVNRoot(svn) root = getSVNRoot(svn)
path = getSVNRelPath(svn) path = getSVNRelPath(svn)
if argv[1] == 'trunk': while True:
Popen([svn, 'switch', root + '/trunk' + path]).wait() if argv[1] == 'trunk':
return 0 Popen([svn, 'switch', root + '/trunk' + path]).wait()
bl = getSVNBranchList(svn) switched = True
if argv[1] in bl: break
Popen([svn, 'switch', root + '/branches/' + argv[1] + path]).wait() bl = getSVNBranchList(svn)
return 0 if argv[1] in bl:
tl = getSVNTagList(svn) Popen([svn, 'switch', root + '/branches/' + argv[1] + path]).wait()
if argv[1] in tl: switched = True
Popen([svn, 'switch', root + '/tags/' + argv[1] + path]).wait() break
tl = getSVNTagList(svn)
if argv[1] in tl:
Popen([svn, 'switch', root + '/tags/' + argv[1] + path]).wait()
switched = True
break
if switched:
Popen(svn + ' info | grep --color=none "^URL:"',
shell = True).wait()
return 0 return 0
return -2 return -2
@ -338,9 +347,6 @@ def main(argv):
if argv[0] == "switch": if argv[0] == "switch":
r = switch(argv, realsvn) r = switch(argv, realsvn)
if r == 0:
Popen(realsvn + ' info | grep --color=none "^URL:"',
shell = True).wait()
if r >= 0: if r >= 0:
return r return r