commit 5a9d565f6a5c77c94cdfa5daaeb88bf8886ea3ae
Author: John Carr <john.carr@unrouted.co.uk>
Date:   Tue Nov 11 09:28:46 2008 +0000

    Simplify logic for choosing layout template. This can only be applied after moduleset cleanup work.

diff --git a/jhbuild/versioncontrol/svn.py b/jhbuild/versioncontrol/svn.py
index 82532d7..577793b 100644
--- a/jhbuild/versioncontrol/svn.py
+++ b/jhbuild/versioncontrol/svn.py
@@ -130,36 +130,23 @@ class SubversionRepository(Repository):
                 module = None
                 revision = None
 
-        template = None
-
-        if module:
-            if revision:
-                if not revision.isdigit():
-                    template = self.branches_template
-            elif tag:
-                template = self.tags_template
-        else:
+        if not module:
             module = name
-            if revision:
-                if revision.isdigit():
-                    template = self.trunk_template
-                else:
-                    template = self.branches_template
-            elif tag:
-                template = self.tags_template
-            else:
-                template = self.trunk_template
+
+        if revision and not revision.isdigit():
+            template = self.branches_template
+        elif tag:
+            template = self.tags_template
+        else:
+            template = self.trunk_template
 
         if module_href is None:
-            if template:
-                template = self.href + template
-                module_href = template % {
-                    'module': module,
-                    'branch': revision,
-                    'tag': tag,
-                }
-            else:
-                module_href = urlparse.urljoin(self.href, module)
+            template = self.href + template
+            module_href = template % {
+                'module': module,
+                'branch': revision,
+                'tag': tag,
+            }
 
         if checkoutdir is None:
             checkoutdir = name
