提交: 9942793c2cf8a8d5b85949bc75c213e9597d26ba - allura (git)

allura

Commit MetaInfo

• 修訂: 9942793c2cf8a8d5b85949bc75c213e9597d26ba (tree)
• 時間: 2010-05-19 22:25:05
• 作者: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

Add neighborhood prefixes to all repository paths

Change Summary

• modified: ForgeGit/forgegit/git_main.py
• modified: ForgeHg/forgehg/hg_main.py
• modified: ForgeSVN/forgesvn/svn_main.py
• modified: pyforge/pyforge/model/repository.py

差異

--- a/ForgeGit/forgegit/git_main.py
+++ b/ForgeGit/forgegit/git_main.py
@@ -108,12 +108,10 @@ class ForgeGitApp(Application):
             create=[role_developer],
             write=[role_developer],
             admin=c.project.acl['tool'])
-        repo = model.GitRepository()
-        repo.name = self.config.options.mount_point + '.git'
-        repo.fs_path = '/git/' + c.project.shortname + '/'
-        repo.url_path = '/' + c.project.shortname + '/'
-        repo.tool = 'git'
-        repo.status = 'initing'
+        repo = model.GitRepository(
+            name=self.config.options.mount_point + '.git',
+            tool='git',
+            status='initing')
         ThreadLocalORMSession.flush_all()
         cloned_from_id = self.config.options.get('cloned_from')
         if cloned_from_id is not None:

--- a/ForgeHg/forgehg/hg_main.py
+++ b/ForgeHg/forgehg/hg_main.py
@@ -110,12 +110,10 @@ class ForgeHgApp(Application):
             write=[role_developer],
             create=[role_developer],
             admin=c.project.acl['tool'])
-        repo = model.HgRepository()
-        repo.name = self.config.options.mount_point
-        repo.fs_path = '/hg/' + c.project.shortname + '/'
-        repo.url_path = '/' + c.project.shortname + '/'
-        repo.tool = 'hg'
-        repo.status = 'initing'
+        repo = model.HgRepository(
+            name=self.config.options.mount_point,
+            tool='hg',
+            status='initing')
         ThreadLocalORMSession.flush_all()
         cloned_from_id = self.config.options.get('cloned_from')
         if cloned_from_id is not None:

--- a/ForgeSVN/forgesvn/svn_main.py
+++ b/ForgeSVN/forgesvn/svn_main.py
@@ -92,8 +92,6 @@ class ForgeSVNApp(Application):
             admin=c.project.acl['tool'])
         repo = model.SVNRepository(
             name=self.config.options.mount_point,
-            fs_path='/svn/' + c.project.shortname + '/',
-            url_path = '/' + c.project.shortname + '/',
             tool = 'svn',
             status = 'creating')
         g.publish('audit', 'scm.svn.init', dict(repo_name=repo.name, repo_path=repo.fs_path))

--- a/pyforge/pyforge/model/repository.py
+++ b/pyforge/pyforge/model/repository.py
@@ -21,6 +21,19 @@ class Repository(Artifact):
     status=FieldProperty(str)
     email_address=''
 
+    def __init__(self, **kw):
+        if 'name' in kw and 'tool' in kw:
+            if 'fs_path' not in kw:
+                kw['fs_path'] = '/' + os.path.join(
+                    kw['tool'],
+                    pylons.c.project.url()[1:],
+                    kw['name'])
+            if 'url_path' not in kw:
+                kw['url_path'] = os.path.join(
+                    pylons.c.project.url(),
+                    kw['name'])
+        super(Repository, self).__init__(**kw)
+
     def url(self):
         return self.app_config.url()