kallithea Changeset - 87aef0cb5a6a

Changeset - 87aef0cb5a6a

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 6 0

Mads Kiilerich - 10 years ago 2015-11-27 01:39:21
madski@unity3d.com

Merge stable

6 files changed with 11 insertions and 11 deletions:

docs/setup.rst

kallithea/controllers/admin/gists.py

kallithea/lib/paster_commands/repo_scan.py

kallithea/templates/admin/gists/edit.html

kallithea/templates/admin/gists/show.html

setup.py

0 comments (0 inline, 0 general)

docs/setup.rst

➞

Show inline comments

@@ @@ -727,13 +727,13 @@ that, you'll need to: @@
 Here is a sample excerpt from an Apache Virtual Host configuration file:
 .. code-block:: apache
     WSGIDaemonProcess kallithea \
         processes=1 threads=4 \
-        python-path=/srv/kallithea/pyenv/lib/python2.7/site-packages
+        python-path=/srv/kallithea/venv/lib/python2.7/site-packages
     WSGIScriptAlias / /srv/kallithea/dispatch.wsgi
     WSGIPassAuthorization On
 Or if using a dispatcher WSGI script with proper virtualenv activation:
 .. code-block:: apache
@@ @@ -755,13 +755,13 @@ Example WSGI dispatch script: @@
     os.environ['PYTHON_EGG_CACHE'] = '/srv/kallithea/.egg-cache'
     # sometimes it's needed to set the curent dir
     os.chdir('/srv/kallithea/')
     import site
-    site.addsitedir("/srv/kallithea/pyenv/lib/python2.7/site-packages")
+    site.addsitedir("/srv/kallithea/venv/lib/python2.7/site-packages")
     from paste.deploy import loadapp
     from paste.script.util.logging_config import fileConfig
     fileConfig('/srv/kallithea/my.ini')
     application = loadapp('config:/srv/kallithea/my.ini')

kallithea/controllers/admin/gists.py

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ from kallithea.model.gist import GistMod @@
 from kallithea.model.meta import Session
 from kallithea.model.db import Gist, User
 from kallithea.lib import helpers as h
 from kallithea.lib.base import BaseController, render
 from kallithea.lib.auth import LoginRequired, NotAnonymous
 from kallithea.lib.utils import jsonify
 from kallithea.lib.utils2 import safe_int, time_to_datetime
+from kallithea.lib.utils2 import safe_int, safe_unicode, time_to_datetime
 from kallithea.lib.helpers import Page
 from sqlalchemy.sql.expression import or_
 from kallithea.lib.vcs.exceptions import VCSError, NodeNotChangedError
 log = logging.getLogger(__name__)
@@ @@ -202,13 +202,13 @@ class GistsController(BaseController): @@
             c.file_changeset, c.files = GistModel().get_gist_files(gist_id,
                                                             revision=revision)
         except VCSError:
             log.error(traceback.format_exc())
             raise HTTPNotFound()
         if format == 'raw':
             content = '\n\n'.join([f.content for f in c.files if (f_path is None or f.path == f_path)])
+            content = '\n\n'.join([f.content for f in c.files if (f_path is None or safe_unicode(f.path) == f_path)])
             response.content_type = 'text/plain'
             return content
         return render('admin/gists/show.html')
     @LoginRequired()
     @NotAnonymous()

kallithea/lib/paster_commands/repo_scan.py

➞

Show inline comments

@@ @@ -53,18 +53,18 @@ class Command(BasePasterCommand): @@
     summary = "Rescan default location for new repositories"
     def command(self):
         #get SqlAlchemy session
         self._init_session()
         rm_obsolete = self.options.delete_obsolete
-        log.info('Now scanning root location for new repos...')
+        print 'Now scanning root location for new repos ...'
         added, removed = repo2db_mapper(ScmModel().repo_scan(),
                                         remove_obsolete=rm_obsolete)
         added = ', '.join(added) or '-'
         removed = ', '.join(removed) or '-'
-        log.info('Scan completed added: %s removed: %s', added, removed)
+        print 'Scan completed added: %s removed: %s' % (added, removed)
     def update_parser(self):
         self.parser.add_option(
             '--delete-obsolete',
             action='store_true',
             help="Use this flag do delete repositories that are "

kallithea/templates/admin/gists/edit.html

➞

Show inline comments

@@ @@ -66,14 +66,14 @@ @@
                 </div>
             </div>
             % for cnt, file in enumerate(c.files):
                 <div id="body" class="codeblock" style="margin-bottom: 4px">
                     <div style="padding: 10px 10px 10px 26px;color:#666666">
                         <input type="hidden" value="${file.path}" name="org_files">
                         <input id="filename_${h.FID('f',file.path)}" name="files" size="30" type="text" value="${file.path}">
                         <input type="hidden" value="${h.safe_unicode(file.path)}" name="org_files">
                         <input id="filename_${h.FID('f',file.path)}" name="files" size="30" type="text" value="${h.safe_unicode(file.path)}">
                         <select id="mimetype_${h.FID('f',file.path)}" name="mimetypes"/>
                     </div>
                     <div class="editor_container">
                         <pre id="editor_pre"></pre>
                         <textarea id="editor_${h.FID('f',file.path)}" name="contents" style="display:none">${file.content}</textarea>
                     </div>

kallithea/templates/admin/gists/show.html

➞

Show inline comments

@@ @@ -78,15 +78,15 @@ @@
                ## iterate over the files
                % for file in c.files:
                <div style="border: 1px solid #EEE;margin-top:20px">
                 <div id="${h.FID('G', file.path)}" class="stats" style="border-bottom: 1px solid #DDD;padding: 8px 14px;">
                     <a href="${c.gist.gist_url()}">¶</a>
                     <b style="margin:0px 0px 0px 4px">${file.path}</b>
+                    <b style="margin:0px 0px 0px 4px">${h.safe_unicode(file.path)}</b>
                     <div style="float:right; margin: -5px">
                        ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=file.path),class_="btn btn-mini")}
+                       ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=h.safe_unicode(file.path)),class_="btn btn-mini")}
                     </div>
                 </div>
                 <div class="code-body">
                     ${h.pygmentize(file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
                 </div>
               </div>

setup.py

➞

Show inline comments

@@ @@ -52,13 +52,13 @@ requirements = [ @@
     "markdown==2.2.1",
     "docutils>=0.8.1,<=0.11",
     "mock",
     "URLObject==2.3.4",
     "Routes==1.13",
     "dulwich>=0.9.9,<=0.9.9",
-    "mercurial>=2.9,<3.6",
+    "mercurial>=2.9,<3.7",
+]
 if sys.version_info < (2, 7):
     requirements.append("importlib==1.0.1")
     requirements.append("unittest2")
     requirements.append("argparse")

0 comments (0 inline, 0 general)