kallithea Changeset - 6ec53c16c744

Changeset - 6ec53c16c744

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-02-14 15:29:53
marcin@python-works.com

fixed binary file issues

3 files changed with 24 insertions and 12 deletions:

rhodecode/controllers/files.py

rhodecode/templates/files/files_annotate.html

rhodecode/templates/files/files_source.html

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -203,54 +203,58 @@ class FilesController(BaseController): @@
             else:
                 c.changeset_2 = EmptyChangeset()
                 node2 = FileNode('.', '', changeset=c.changeset_2)
         except RepositoryError:
             return redirect(url('files_home',
                                 repo_name=c.repo_name, f_path=f_path))
         f_udiff = differ.get_udiff(node1, node2)
         diff = differ.DiffProcessor(f_udiff)
         if c.action == 'download':
             diff_name = '%s_vs_%s.diff' % (diff1, diff2)
             response.content_type = 'text/plain'
             response.content_disposition = 'attachment; filename=%s' \
                                                     % diff_name
             return diff.raw_diff()
         elif c.action == 'raw':
             response.content_type = 'text/plain'
             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:
                 c.cur_diff = _('Binary file')
             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')
             elif node1.is_binary or node2.is_binary:
                 c.cur_diff = _('Binary file')
             else:
                 c.cur_diff = diff.as_html()
         if not c.cur_diff: c.no_changes = True
         return render('files/file_diff.html')
     def _get_history(self, repo, node, f_path):
         from vcs.nodes import NodeKind
         if not node.kind is NodeKind.FILE:
             return []
         changesets = node.history
         hist_l = []
         changesets_group = ([], _("Changesets"))
         branches_group = ([], _("Branches"))
         tags_group = ([], _("Tags"))
         for chs in changesets:
             n_desc = 'r%s:%s' % (chs.revision, chs.short_id)
             changesets_group[0].append((chs.raw_id, n_desc,))
         hist_l.append(changesets_group)
         for name, chs in c.repository_branches.items():

rhodecode/templates/files/files_annotate.html

➞

Show inline comments

@@ @@ -42,46 +42,50 @@ @@
 						h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))}
 					/ ${h.link_to(_('show as raw'),
 						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))}
 					/ ${h.link_to(_('download as raw'),
 						h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))}
 				</dd>
 			    <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")}
 			        ${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")}
 					%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_source.html

➞

Show inline comments

@@ @@ -15,73 +15,77 @@ @@
 			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
 		 / ${h.link_to(_('download as raw'),
 			h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
 	</dd>
 	<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")}
 		${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='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
        <script type="text/javascript">
            function highlight_lines(lines){
                for(pos in lines){
                  YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE');
+               }
+           }
            page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L');
            if (page_highlights.length == 2){
               highlight_ranges  = page_highlights[1].split(",");
               var h_lines = [];
               for (pos in highlight_ranges){
                    var _range = highlight_ranges[pos].split('-');
                    if(_range.length == 2){
                        var start = parseInt(_range[0]);
                        var end = parseInt(_range[1]);
                        if (start < end){
                            for(var i=start;i<=end;i++){
                                h_lines.push(i);
+                           }
+                       }
+                   }
                    else{
                        h_lines.push(parseInt(highlight_ranges[pos]));
+                   }
+             }
            highlight_lines(h_lines);
+           }
        </script>
        </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_home',repo_name=c.repo_name,revision='__CS__',f_path=c.f_path)}".replace('__CS__',cs);
         window.location = url;
         });
    });
 </script>
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)