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

log: allow ".." syntax for specifying references

Browse Source
This commit is contained in:
Josh Holtrop 2012-06-27 11:12:53 -04:00
parent ac52eabb09
commit 1150cede62
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jsvn
View File

@ -728,12 +728,10 @@ def diff(argv, svn, out):
ref1, operator, ref2 = m.group(1, 2, 3) ref1, operator, ref2 = m.group(1, 2, 3)
url1, path1 = resolve_reference(svn, ref1) url1, path1 = resolve_reference(svn, ref1)
if url1 == '': if url1 == '':
sys.stderr.write('Could not resolve reference "%s"\n' % ref1) continue
return RET_ERR
url2, path2 = resolve_reference(svn, ref2) url2, path2 = resolve_reference(svn, ref2)
if url2 == '': if url2 == '':
sys.stderr.write('Could not resolve reference "%s"\n' % ref2) continue
return RET_ERR
if operator == '...': if operator == '...':
# amend url1 to include the pegged revision from where ref2 # amend url1 to include the pegged revision from where ref2
# originally branched from it # originally branched from it
@ -751,6 +749,23 @@ def diff(argv, svn, out):
return RET_OK return RET_OK
def log(argv, svn, out): def log(argv, svn, out):
for i, v in enumerate(argv):
m = re.match('(.*)(\.\.)(.*)$', v)
if m is not None:
ref1, operator, ref2 = m.group(1, 2, 3)
url1, path1 = resolve_reference(svn, ref1)
if url1 == '':
continue
url2, path2 = resolve_reference(svn, ref2)
if url2 == '':
continue
r = find_branched_revision(svn, url2, path2, path1)
if r < 0:
sys.stderr.write(('Could not find revision where "%s" ' +
'branched from "%s"\n') % (ref2, ref1))
return RET_ERR
argv = argv[:i] + ['-rHEAD:%d' % (r + 1), url2] + argv[i + 1:]
break
mode = 'normal' mode = 'normal'
pout = Popen([svn] + argv, stdout=PIPE).stdout pout = Popen([svn] + argv, stdout=PIPE).stdout
for line in iter(pout.readline, ''): for line in iter(pout.readline, ''):