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

Merge branch 'master' of /home/josh/files

Browse Source
This commit is contained in:
Josh Holtrop 2011-01-25 11:52:18 -05:00
commit 6e57fda0c4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jsvn
View File

@ -137,7 +137,8 @@ def merge(argv, svn):
branches = getSVNBranchList(svn) branches = getSVNBranchList(svn)
if not argv[1] in branches: if not argv[1] in branches:
return -3 return -3
lines = Popen([svn, 'log', '--stop-on-copy', root + '/branches/' + argv[1]]) lines = Popen([svn, 'log', '--stop-on-copy', root + '/branches/' + argv[1]],
stdout=PIPE).communicate()[0].split('\n')
rev = 0 rev = 0
for line in lines: for line in lines:
m = re.match(r'^r(\d+)\s', line) m = re.match(r'^r(\d+)\s', line)
@ -149,7 +150,7 @@ def merge(argv, svn):
path = getSVNRelPath(svn) path = getSVNRelPath(svn)
Popen([svn, 'merge', '-r%s:HEAD' % rev, Popen([svn, 'merge', '-r%s:HEAD' % rev,
root + '/branches/' + argv[1] + path, '.']).wait() root + '/branches/' + argv[1] + path, '.']).wait()
return -2 return 0
def main(argv): def main(argv):
realsvn = findInPath('svn') realsvn = findInPath('svn')
@ -184,6 +185,10 @@ def main(argv):
Popen([colordiff], stdin=diff_out).wait() Popen([colordiff], stdin=diff_out).wait()
return 0 return 0
if argv[0] == "root":
sys.stdout.write(getSVNRoot(realsvn) + '\n')
return 0
if colorsvn != '': if colorsvn != '':
realsvn = colorsvn realsvn = colorsvn