Treat git-svn git checkouts correctly. Mute tags/*

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 914a900f707815dc7f1a31f6136aaa4cf9d7d291..79554ea6eece604e27f0001e91329911432dc997 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -233,22 +233,25 @@ class vcs_gitsvn(vcs):
                     raise VCSException("Git svn rebase failed")
                 self.refreshed = True
         if rev:
-            if rev == 'trunk':
-                if subprocess.call(['git', 'checkout', 'trunk'], cwd=self.local) != 0:
-                    raise VCSException("Git checkout failed")
+            # Try finding a svn tag
+            p = subprocess.Popen(['git', 'checkout', 'tags/' + rev],
+                    cwd=self.local, stderr=subprocess.PIPE)
+            if p.returncode == 0:
+                print p.communicate()[0]
             else:
-                # Try finding a svn tag
-                if subprocess.call(['git', 'checkout', 'tags/' + rev], cwd=self.local) != 0:
-                    # No tag found, normal svn rev translation
-                    # Translate svn rev into git format
-                    p = subprocess.Popen(['git', 'svn', 'find-rev', 'r' + rev],
-                        cwd=self.local, stdout=subprocess.PIPE)
-                    rev = p.communicate()[0].rstrip()
-                    if p.returncode != 0 or len(rev) == 0:
-                        raise VCSException("Failed to get git treeish from svn rev")
-                    # Check out the appropriate git revision...
-                    if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0:
-                        raise VCSException("Git checkout failed")
+                # No tag found, normal svn rev translation
+                # Translate svn rev into git format
+                p = subprocess.Popen(['git', 'svn', 'find-rev', 'r' + rev],
+                    cwd=self.local, stdout=subprocess.PIPE)
+                rev = p.communicate()[0].rstrip()
+                if p.returncode != 0 or len(rev) == 0:
+                    # If it's not a svn rev, do a normal git checkout (master,
+                    # trunk, raw git sha, etc)
+                    if subprocess.call(['git', 'checkout', 'trunk'], cwd=self.local) != 0:
+                        raise VCSException("No git treeish found and direct git checkout failed")
+                # Check out the appropriate git revision...
+                if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0:
+                    raise VCSException("Git checkout failed")
         # Get rid of any uncontrolled files left behind...
         if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
             raise VCSException("Git clean failed")