mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-11 15:13:27 +02:00
git-svn: Support <branch>/<rev> in commit field
commit=<rev> is still supported
This commit is contained in:
parent
d6dbad65c6
commit
15c0a2779a
@ -454,7 +454,16 @@ class vcs_gitsvn(vcs):
|
||||
else:
|
||||
# No tag found, normal svn rev translation
|
||||
# Translate svn rev into git format
|
||||
p = subprocess.Popen(['git', 'svn', 'find-rev', 'r' + rev],
|
||||
rev_split=rev.split('/')
|
||||
if len(rev_split) > 1:
|
||||
treeish=rev_split[0]
|
||||
svn_rev=rev_split[1]
|
||||
else:
|
||||
# if no branch is specified, then assume trunk (ie. 'master'
|
||||
# branch):
|
||||
treeish='master'
|
||||
svn_rev=rev
|
||||
p = subprocess.Popen(['git', 'svn', 'find-rev', 'r' + svn_rev, treeish],
|
||||
cwd=self.local, stdout=subprocess.PIPE)
|
||||
git_rev = p.communicate()[0].rstrip()
|
||||
if p.returncode != 0 or not git_rev:
|
||||
|
Loading…
Reference in New Issue
Block a user