From: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>
Date: Fri, 24 Jan 2014 08:47:57 +0000 (+0200)
Subject: git-svn: Support <branch>/<rev> in commit field
X-Git-Tag: 0.2~372^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=15c0a2779af22d3263e90cfa9108f162a219b1d3;p=fdroidserver.git

git-svn: Support <branch>/<rev> in commit field

commit=<rev> is still supported
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 2cc1bf1f..27078ade 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -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: