Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SVN references to point to Git #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHEROKEE_WEB-server.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import PageIndex
import PageDownload
import PageDownloadIndex
import PageSVN
import PageGit
import PageDistro
import PageDoc
import PageCommunity
Expand Down
2 changes: 1 addition & 1 deletion Commits.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def get_commit_list (num):
# Update
run ('git pull')

# Query SVN server
# Query Git repository
cont = run ('git log --branches --pretty=format:"%an||%ar||%s||%H" -'+str(num))

# Parse
Expand Down
6 changes: 3 additions & 3 deletions PageSVN.py → PageGit.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
import CTK
import Page

class SVN:
FILE = "static/html/SVN.html"
class Git:
FILE = "static/html/Git.html"

def __call__ (self):
page = Page.Page_Menu()
page += CTK.RawHTML(open(self.FILE,'r').read())
return CTK.HTTP_Cacheable (60, body=page.Render())

CTK.publish ('^/svn(\.html)?$', SVN)
CTK.publish ('^/git(\.html)?$', Git)
20 changes: 20 additions & 0 deletions static/html/Git.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<h1>Git repository</h1>
<p>The Cherokee source code is available via Git on GitHub. Anyone can clone the source via Git, but only certain people have the ability to commit to the main repository. We openly encourage contributions via Pull Requests and patches!</p>
<p>Briefly, Git is a system tool used to store and maintain files and a history of their changes over time. The Cherokee source code and related files are housed at GitHub. You can read more about Git at <a href="http://git-scm.com/">git-scm.com</a></p>

<h2>Browsing the sources</h2>
<p>Though Git repositories are most commonly accessed using a special piece of software called a <a href="http://git-scm.com/downloads">Git client</a>, there is a web-based interface to view the repositories. Browsing the source tree gives you a great view into the current status of this project's code. You may also view the complete histories of any file in the repository.</p>
<p>If you'd like to browse the source via the web, visit <a href="http://github.com/cherokee/">http://github.com/cherokee/</a> and click into the relevant repository.</p>

<h2>Obtaining (cloning) the source</h2>
<p>To see the available modules, look throught the list for the Cherokee organization on GitHub at <a href="http://github.com/cherokee/">http://github.com/cherokee/</a>. After clicking into a repository, GitHub will provide you with URLs to use with your Git client.</p>
<p>To take a copy of sources of a repository for the first time, use this command:</p>
<blockquote><pre class="shell">git clone --recursive git://github.com/cherokee/webserver.git cherokee</pre></blockquote>
<h2>Updating the sources</h2>
<p>To update your local repository, use this command within your local repository:</p>
<blockquote><pre class="shell">git pull</pre></blockquote>

<h2>Ignoring directories or files</h2>
<p>Git stores ignored files per-repository and per-directory. To edit the ignored files of the directory you are currently in, edit the</p>
<blockquote><pre class="shell">.gitignore</pre></blockquote>
<p>with your favorite editor. Within this file, record the names and patterns of the files you want to ignore, one file per line. Once you are done, commit your changes so the .gitignore file gets saved into the revision history. For more information on gitignore files, see its <a href="http://www.kernel.org/pub/software/scm/git/docs/gitignore.html">Manual page</a>.</p>
28 changes: 0 additions & 28 deletions static/html/SVN.html

This file was deleted.