You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/09/02 16:26:10 UTC
allura git commit: [#7538] ticket:850 If diff is empty,
show file was unchanged message
Repository: allura
Updated Branches:
refs/heads/master 65c0d9258 -> 36b4b7015
[#7538] ticket:850 If diff is empty, show file was unchanged message
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/36b4b701
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/36b4b701
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/36b4b701
Branch: refs/heads/master
Commit: 36b4b701550db92d706a42410165c931308ece8f
Parents: 65c0d92
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Sat Aug 29 20:12:36 2015 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Sep 2 13:59:12 2015 +0000
----------------------------------------------------------------------
Allura/allura/lib/app_globals.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/36b4b701/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 5d262e8..1d88c9d 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -396,6 +396,8 @@ class Globals(object):
def highlight(self, text, lexer=None, filename=None):
if not text:
+ if lexer == 'diff':
+ return h.html.literal('<em>File contents unchanged</em>')
return h.html.literal('<em>Empty file</em>')
# Don't use line numbers for diff highlight's, as per [#1484]
if lexer == 'diff':