Mercurial > kallithea

changeset 5163:06c4ff173b5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge stable
author Mads Kiilerich <madski@unity3d.com>
date Sat, 06 Jun 2015 17:41:27 +0200
parents 2c1ae0b188ae (current diff) 9c067ee8d368 (diff)
children 4f4d2e899a02
files kallithea/lib/vcs/backends/git/repository.py kallithea/public/js/base.js kallithea/templates/files/files_browser.html kallithea/templates/summary/summary.html
diffstat 5 files changed, 20 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/vcs/backends/git/repository.py	Wed May 27 23:15:36 2015 +0200
+++ b/kallithea/lib/vcs/backends/git/repository.py	Sat Jun 06 17:41:27 2015 +0200
@@ -18,12 +18,18 @@
 import logging
 import posixpath
 import string
-try:
-    # Python <=2.7
-    from pipes import quote
-except ImportError:
-    # Python 3.3+
-    from shlex import quote
+import sys
+if sys.platform == "win32":
+    from subprocess import list2cmdline
+    def quote(s):
+        return list2cmdline([s])
+else:
+    try:
+        # Python <=2.7
+        from pipes import quote
+    except ImportError:
+        # Python 3.3+
+        from shlex import quote
 
 from dulwich.objects import Tag
 from dulwich.repo import Repo, NotGitRepository
--- a/kallithea/model/repo.py	Wed May 27 23:15:36 2015 +0200
+++ b/kallithea/model/repo.py	Sat Jun 06 17:41:27 2015 +0200
@@ -210,9 +210,9 @@
 
         def desc(desc):
             if c.visual.stylify_metatags:
-                return h.urlify_text(h.desc_stylize(h.escape(h.truncate(desc, 60))))
+                return h.urlify_text(h.desc_stylize(h.html_escape(h.truncate(desc, 60))))
             else:
-                return h.urlify_text(h.escape(h.truncate(desc, 60)))
+                return h.urlify_text(h.html_escape(h.truncate(desc, 60)))
 
         def state(repo_state):
             return _render("repo_state", repo_state)
--- a/kallithea/public/js/base.js	Wed May 27 23:15:36 2015 +0200
+++ b/kallithea/public/js/base.js	Sat Jun 06 17:41:27 2015 +0200
@@ -735,6 +735,9 @@
     var success = function(o){
         var $deleted = $('#comment-tr-'+comment_id);
         var $prev = $deleted.prev('tr');
+        while ($prev.hasClass('inline-comments')){
+            $prev = $prev.prev('tr');
+        }
         $deleted.remove();
         _placeAddButton($prev);
     }
--- a/kallithea/templates/files/files_browser.html	Wed May 27 23:15:36 2015 +0200
+++ b/kallithea/templates/files/files_browser.html	Sat Jun 06 17:41:27 2015 +0200
@@ -90,7 +90,7 @@
                      </td>
                      <td>
                          %if node.is_file():
-                             <a title="${h.tooltip(node.last_changeset.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset)}" class="tooltip revision-link">${h.show_id(node.last_changeset)}</a>
+                             <a title="${h.tooltip(node.last_changeset.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset.raw_id)}" class="tooltip revision-link">${h.show_id(node.last_changeset)}</a>
                          %endif
                      </td>
                      <td>
--- a/kallithea/templates/summary/summary.html	Wed May 27 23:15:36 2015 +0200
+++ b/kallithea/templates/summary/summary.html	Sat Jun 06 17:41:27 2015 +0200
@@ -85,9 +85,9 @@
                   <label>${_('Description')}:</label>
               </div>
                  %if c.visual.stylify_metatags:
-                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.desc_stylize(h.escape(c.db_repo.description)))}</div>
+                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.desc_stylize(h.html_escape(c.db_repo.description)))}</div>
                  %else:
-                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.escape(c.db_repo.description))}</div>
+                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.html_escape(c.db_repo.description))}</div>
                  %endif
             </div>