kallithea Changeset - 0dc8d578ff49

Changeset - 0dc8d578ff49

Parent rev.

Child rev.

[Not reviewed]

default

0 10 0

Marcin Kuzminski - 15 years ago 2011-04-09 18:38:18
marcin@python-works.com

merges for stable

10 files changed with 62 insertions and 48 deletions:

docs/changelog.rst

rhodecode/controllers/feed.py

rhodecode/controllers/files.py

rhodecode/controllers/home.py

rhodecode/templates/base/base.html

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changeset/changeset.html

rhodecode/templates/files/files_annotate.html

rhodecode/templates/files/files_browser.html

rhodecode/templates/files/files_source.html

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -23,13 +23,13 @@ fixes @@
 - fixed tooltip flickering problems
 - fixed came_from redirection on windows
 - fixed logging modules,and sql formatters
 - windows fixes for os.kill #133
 - fixes path splitting for windows issues #148
 - fixed issue #143 wrong import on migration to 1.1.X
+- fixed problems with displaying binary files, thanks to Thomas Waldmann
 .1.7 (**2011-03-23**)
 ======================
 news
 ----

rhodecode/controllers/feed.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.feed
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
     Feed controller for rhodecode
     :created_on: Apr 23, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Files controller for RhodeCode
     :created_on: Apr 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
@@ @@ -42,12 +42,13 @@ from vcs.exceptions import RepositoryErr @@
     ChangesetDoesNotExistError, EmptyRepositoryError
 from vcs.nodes import FileNode
 from vcs.utils import diffs as differ
 log = logging.getLogger(__name__)
 class FilesController(BaseController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
@@ @@ -55,13 +56,13 @@ class FilesController(BaseController): @@
         c.cut_off_limit = self.cut_off_limit
     def __get_cs_or_redirect(self, rev, repo_name):
         """
         Safe way to get changeset if error occur it redirects to tip with
         proper message
         :param rev: revision to fetch
         :param repo_name: repo name to redirect after
         """
         _repo = ScmModel().get_repo(c.repo_name)
         try:
@@ @@ -225,16 +226,17 @@ class FilesController(BaseController): @@
             response.content_type = 'text/plain'
             if node1.is_binary or node2.is_binary:
                 return _('binary file changed')
             return diff.raw_diff()
         elif c.action == 'diff':
             if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit:
                 c.cur_diff = _('Diff is to big to display')
             elif node1.is_binary or node2.is_binary:
             if  node1.is_binary or node2.is_binary:
                 c.cur_diff = _('Binary file')
             elif node1.size > self.cut_off_limit or \
                     node2.size > self.cut_off_limit:
                 c.cur_diff = _('Diff is too big to display')
             else:
                 c.cur_diff = diff.as_html()
         else:
             #default option
             if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit:
                 c.cur_diff = _('Diff is to big to display')

rhodecode/controllers/home.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.home
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
     Home controller for Rhodecode
     :created_on: Feb 18, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -82,13 +82,16 @@ @@
 	<!-- footer -->
 	<div id="footer">
 	   <div id="footer-inner" class="title bottom-left-rounded-corner bottom-right-rounded-corner">
 	       <div>
 	           <p class="footer-link">${h.link_to(_('Submit a bug'),h.url('bugtracker'))}</p>
 		       <p class="footer-link-right"><a href="${h.url('rhodecode_official')}">RhodeCode</a> ${c.rhodecode_version} &copy; 2010-2011 by Marcin Kuzminski</p>
 		       <p class="footer-link-right">
 			       <a href="${h.url('rhodecode_official')}">RhodeCode</a>
        	           ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
 		       </p>
 	       </div>
 	   </div>
         <script type="text/javascript">
         function tooltip_activate(){
         ${h.tooltip.activate()}
+        }

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -29,22 +29,21 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 			<div id="graph">
 				<div id="graph_nodes">
 					<canvas id="graph_canvas"></canvas>
 				</div>
 				<div id="graph_content">
 					<div class="container_header">
         ${h.form(h.url.current(),method='get')}
         <div class="info_box">
           <span>${_('Show')}:</span>
           ${h.text('size',size=1,value=c.size)}
           <span>${_('revisions')}</span>
           ${h.submit('set',_('set'))}
         </div>
         ${h.end_form()}
 				        ${h.form(h.url.current(),method='get')}
 				        <div class="info_box">
 				          <span>${_('Show')}:</span>
 				          ${h.text('size',size=1,value=c.size)}
 				          <span>${_('revisions')}</span>
 				          ${h.submit('set',_('set'))}
 				        </div>
 				        ${h.end_form()}
 					</div>
 				%for cnt,cs in enumerate(c.pagination):
 					<div id="chg_${cnt+1}" class="container">
 						<div class="left">
 							<div class="date">${_('commit')} ${cs.revision}: ${h.short_id(cs.raw_id)}@${cs.date}</div>
 							<div class="author">
@@ @@ -94,13 +93,13 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 				<div class="pagination-wh pagination-left">
 					${c.pagination.pager('$link_previous ~2~ $link_next')}
 				</div>
 				</div>
 			</div>
-			<script type="text/javascript" src="${h.url("/js/graph.js")}"></script>
+			<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
 			<script type="text/javascript">
 				YAHOO.util.Event.onDOMReady(function(){
 					function set_canvas() {
 						var c = document.getElementById('graph_nodes');
 						var t = document.getElementById('graph_content');
 						canvas = document.getElementById('graph_canvas');

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name}
 </%def>
@@ @@ -78,36 +80,36 @@ @@
 		         </span>
 	                </div>
 	        </div>
 	        <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span>
 	        <div class="cs_files">
 	                %for change,filenode,diff,cs1,cs2 in c.changes:
 	                    <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div>
+	                    <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.repo_name_slug('CHANGE-%s' % h.safe_unicode(filenode.path))))}</div>
 	                %endfor
 	        </div>
 	    </div>
     </div>
 	%for change,filenode,diff,cs1,cs2 in c.changes:
 		%if change !='removed':
 		<div style="clear:both;height:10px"></div>
 		<div id="body" class="diffblock">
 			<div id="${'CHANGE-%s'%filenode.path}" class="code-header">
+			<div id="${h.repo_name_slug('CHANGE-%s' % h.safe_unicode(filenode.path))}" class="code-header">
 				<div class="changeset_header">
 					<span class="changeset_file">
 						${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name,
 						revision=filenode.changeset.raw_id,f_path=filenode.path))}
 						${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
 						revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
 					</span>
 					%if 1:
 					&raquo; <span>${h.link_to(_('diff'),
 					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='diff'))}</span>
+					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span>
 					&raquo; <span>${h.link_to(_('raw diff'),
 					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='raw'))}</span>
+					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>
 					&raquo; <span>${h.link_to(_('download diff'),
 					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='download'))}</span>
+					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>
 					%endif
 				</div>
 			</div>
 			<div class="code-body">
 					%if diff:
 						${diff|n}

rhodecode/templates/files/files_annotate.html

➞

Show inline comments

@@ @@ -48,40 +48,44 @@ @@
 			    <dt>${_('History')}</dt>
 			    <dd>
 			        <div>
 			        ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
 			        ${h.hidden('diff2',c.file.last_changeset.raw_id)}
 			        ${h.select('diff1',c.file.last_changeset.raw_id,c.file_history)}
 			        ${h.submit('diff','diff to revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 			        ${h.submit('show_rev','show at revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 			        ${h.submit('diff','diff to revision',class_="ui-button")}
 			        ${h.submit('show_rev','show at revision',class_="ui-button")}
 			        ${h.end_form()}
 			        </div>
 			    </dd>
 			</dl>
 			<div id="body" class="codeblock">
 				<div class="code-header">
 					<div class="revision">${c.file.name}@r${c.file.last_changeset.revision}:${h.short_id(c.file.last_changeset.raw_id)}</div>
 					<div class="commit">"${c.file.message}"</div>
 				</div>
 				<div class="code-body">
 			       %if c.file.is_binary:
 			           ${_('Binary file')}
 			       %else:
 					% if c.file.size < c.cut_off_limit:
-						${h.pygmentize_annotation(c.file,linenos=True,anchorlinenos=True,lineanchors='S',cssclass="code-highlight")}
+						${h.pygmentize_annotation(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
 					%else:
 						${_('File is to big to display')} ${h.link_to(_('show as raw'),
 						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))}
 					%endif
 					%endif
 		            <script type="text/javascript">
 		            YAHOO.util.Event.onDOMReady(function(){
 		                YAHOO.util.Event.addListener('show_rev','click',function(e){
 		                    YAHOO.util.Event.preventDefault(e);
 		                    var cs = YAHOO.util.Dom.get('diff1').value;
 		                    var url = "${h.url('files_annotate_home',repo_name=c.repo_name,revision='__CS__',f_path=c.f_path)}".replace('__CS__',cs);
 		                    window.location = url;
 		                    });
 		               });
 		            </script>
 				   %endif
 				</div>
 			</div>
 			<script type="text/javascript">
 			YAHOO.util.Event.onDOMReady(function(){
 			    YAHOO.util.Event.addListener('show_rev','click',function(e){
 			        YAHOO.util.Event.preventDefault(e);
 			        var cs = YAHOO.util.Dom.get('diff1').value;
 			        var url = "${h.url('files_annotate_home',repo_name=c.repo_name,revision='__CS__',f_path=c.f_path)}".replace('__CS__',cs);
 			        window.location = url;
 			        });
 			   });
 			</script>
 		</div>
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@

rhodecode/templates/files/files_browser.html

➞

Show inline comments

@@ @@ -46,13 +46,13 @@ @@
 				</tr>
           		%endif
 		    %for cnt,node in enumerate(c.files_list):
 				<tr class="parity${cnt%2}">
 		             <td>
 						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=node.path),class_=file_class(node))}
+						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=h.safe_unicode(node.path)),class_=file_class(node))}
 		             </td>
 		             <td>
 		             %if node.is_file():
 		             	${h.format_byte_size(node.size,binary=True)}
 		             %endif
 		             </td>
@@ @@ -61,13 +61,13 @@ @@
 		                  ${node.mimetype}
 		              %endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		<span class="tooltip" title="${node.last_changeset.raw_id}">
 		             		${node.last_changeset.revision}</span>
+		             		${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}</span>
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		<span class="tooltip" title="${node.last_changeset.date}">
                             ${h.age(node.last_changeset.date)}</span>

rhodecode/templates/files/files_source.html

➞

Show inline comments

@@ @@ -19,32 +19,36 @@ @@
 	<dt>${_('History')}</dt>
 	<dd>
 		<div>
 		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
 		${h.hidden('diff2',c.files_list.last_changeset.raw_id)}
 		${h.select('diff1',c.files_list.last_changeset.raw_id,c.file_history)}
 		${h.submit('diff','diff to revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 		${h.submit('show_rev','show at revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 		${h.submit('diff','diff to revision',class_="ui-button")}
 		${h.submit('show_rev','show at revision',class_="ui-button")}
 		${h.end_form()}
 		</div>
 	</dd>
 </dl>
 <div id="body" class="codeblock">
 	<div class="code-header">
 		<div class="revision">${c.files_list.name}@r${c.files_list.last_changeset.revision}:${h.short_id(c.files_list.last_changeset.raw_id)}</div>
 		<div class="commit">"${c.files_list.last_changeset.message}"</div>
 	</div>
 	<div class="code-body">
 	   %if c.files_list.is_binary:
 	       ${_('Binary file')}
 	   %else:
 		% if c.files_list.size < c.cut_off_limit:
-			${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='S',cssclass="code-highlight")}
+			${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
 		%else:
 			${_('File is to big to display')} ${h.link_to(_('show as raw'),
 			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
 		%endif
 	   %endif
 	</div>
 </div>
 <script type="text/javascript">
 YAHOO.util.Event.onDOMReady(function(){
     YAHOO.util.Event.addListener('show_rev','click',function(e){

0 comments (0 inline, 0 general)