Commit: c9bbc48128d44548ae9375555f791ca7fd3227b1 - allura (git)

allura

Commit MetaInfo

• Revisión: c9bbc48128d44548ae9375555f791ca7fd3227b1 (tree)
• Tiempo: 2012-07-10 00:22:30
• Autor: Jenny Steele <jsteele@geek...>
• Commiter: Tim Van Steenburgh

Log Message

[#4382] Added scm getting started help

Cambiar Resumen

• modified: ForgeGit/forgegit/templates/git/index.html
• modified: ForgeHg/forgehg/templates/hg/index.html
• modified: ForgeSVN/forgesvn/controllers.py
• modified: ForgeSVN/forgesvn/templates/svn/index.html

Diferencia incremental

--- a/ForgeGit/forgegit/templates/git/index.html
+++ b/ForgeGit/forgegit/templates/git/index.html
@@ -20,6 +20,40 @@
       <a href="log?page=1">More</a>
     {% endif %}
   {% else %}
+    {% if h.has_access(c.app, 'write')() %}
+    <div class="message warning scm-learn-basics">
+      <div class="content">
+        Are you new to Git? <a href="http://git-scm.com/doc">Learn the basics</a>.
+      </div>
+    </div>
+
+    <p>It looks like this Git repository doesn't have any files in it. Let's commit your project code now.</p>
+
+    <h2>First time using Git</h2>
+
+    <div class="codehilite">
+      <pre>cd {{c.app.repo.suggested_clone_dest_path()}}
+git init
+git commit -a -m 'Initial commit'
+git remote add origin {{c.app.repo.clone_url('rw', c.user.username)}}
+git push origin master</pre>
+    </div>
+
+    <h2>Existing Repository</h2>
+
+    <div class="codehilite">
+      <pre>cd {{c.app.repo.suggested_clone_dest_path()}}
+git remote add origin {{c.app.repo.clone_url('rw', c.user.username)}}
+git push origin master</pre>
+    </div>
+    &nbsp;
+    <div class="message info scm-ssh-key">
+      <div class="content">
+        Did you get asked for your SourceForge password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="https://sourceforge.net/account/ssh">setting up an ssh-key</a>.
+      </div>
+    </div>
+    {% else %}
     <p><b>No (more) commits</b></p>
+    {% endif %}
   {% endif %}
 {% endblock %}

--- a/ForgeHg/forgehg/templates/hg/index.html
+++ b/ForgeHg/forgehg/templates/hg/index.html
@@ -21,6 +21,46 @@
       <a href="log?page=1">More</a>
     {% endif %}
   {% else %}
+    {% if h.has_access(c.app, 'write')() %}
+    <div class="message warning scm-learn-basics">
+      <div class="content">
+        Are you new to Mercurial? <a href="http://mercurial.selenic.com/guide/">Learn the basics</a>.
+      </div>
+    </div>
+
+    <p>It looks like this Mercurial repository doesn't have any files in it. Let's commit your project code now.</p>
+
+    <h2>First time using Mercurial</h2>
+
+    <div class="codehilite">
+      <pre>{{c.app.repo.clone_command('rw')}}
+cd {{c.app.repo.suggested_clone_dest_path()}}
+touch README
+hg add
+hg commit -m 'Initial commit'
+hg push</pre>
+    </div>
+
+    <h2>Existing Repository</h2>
+
+    <p>Add the new repository as a remote in .hg/hgrc like this:</p>
+    <div class="codehilite">
+      <pre>[paths]
+default = {{c.app.repo.clone_url('rw', c.user.username)}}</pre>
+    </div>
+    <p>Now you can push your code to the repository.</p>
+    <div class="codehilite">
+      <pre>cd {{c.app.repo.suggested_clone_dest_path()}}
+hg push</pre>
+    </div>
+    &nbsp;
+    <div class="message info scm-ssh-key">
+      <div class="content">
+        Did you get asked for your SourceForge password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="https://sourceforge.net/account/ssh">setting up an ssh-key</a>.
+      </div>
+    </div>
+    {% else %}
     <p><b>No (more) commits</b></p>
+    {% endif %}
   {% endif %}
 {% endblock %}

--- a/ForgeSVN/forgesvn/controllers.py
+++ b/ForgeSVN/forgesvn/controllers.py
@@ -3,6 +3,7 @@ from tg.decorators import with_trailing_slash
 from pylons import c
 
 from allura.controllers import repository
+from allura.lib import helpers as h
 
 class BranchBrowser(repository.BranchBrowser):
 
@@ -13,7 +14,7 @@ class BranchBrowser(repository.BranchBrowser):
     @with_trailing_slash
     def index(self, limit=None, page=0, count=0, **kw):
         latest = c.app.repo.latest(branch=self._branch)
-        if not latest:
+        if not latest or (latest.object_id.split(':')[1] == '1' and h.has_access(c.app, 'write')()):
             return dict(allow_fork=False, log=[])
         redirect(latest.url() + 'tree/')
 

--- a/ForgeSVN/forgesvn/templates/svn/index.html
+++ b/ForgeSVN/forgesvn/templates/svn/index.html
@@ -20,6 +20,35 @@
       <a href="{{c.app.url}}log?page=1">More</a>
     {% endif %}
   {% else %}
+    {% if h.has_access(c.app, 'write')() %}
+    <div class="message warning scm-learn-basics">
+      <div class="content">
+        Are you new to Subversion? <a href="http://svnbook.red-bean.com/">Learn the basics</a>.
+      </div>
+    </div>
+
+    <p>It looks like this Subversion repository doesn't have any files in it. Let's commit your project code now.</p>
+
+    <h2>Import project to Subversion</h2>
+
+    <div class="codehilite">
+      <pre>cd existing-{{c.app.repo.suggested_clone_dest_path()}}
+svn import {{c.app.repo.clone_url('rw', c.user.username)}} -m "Initial commit"</pre>
+    </div>
+
+    <h2>Check out a working directory</h2>
+
+    <div class="codehilite">
+      <pre>{{c.app.repo.clone_command('rw')}}</pre>
+    </div>
+    &nbsp;
+    <div class="message info scm-ssh-key">
+      <div class="content">
+        Did you get asked for your SourceForge password during this process? You can securely use your Subversion repository and avoid having to re-enter your password by <a href="https://sourceforge.net/account/ssh">setting up an ssh-key</a>.
+      </div>
+    </div>
+    {% else %}
     <p><b>No (more) commits</b></p>
+    {% endif %}
   {% endif %}
 {% endblock %}