Show More
@@ -186,7 +186,7 b' class _FilesBreadCrumbs(object):' | |||||
186 |
|
186 | |||
187 | def __call__(self, repo_name, rev, paths): |
|
187 | def __call__(self, repo_name, rev, paths): | |
188 | if isinstance(paths, str): |
|
188 | if isinstance(paths, str): | |
189 | paths = paths.decode('utf-8') |
|
189 | paths = paths.decode('utf-8', 'replace') | |
190 | url_l = [link_to(repo_name, url('files_home', |
|
190 | url_l = [link_to(repo_name, url('files_home', | |
191 | repo_name=repo_name, |
|
191 | repo_name=repo_name, | |
192 | revision=rev, f_path=''))] |
|
192 | revision=rev, f_path=''))] | |
@@ -683,6 +683,6 b' def changed_tooltip(nodes):' | |||||
683 | suf = '' |
|
683 | suf = '' | |
684 | if len(nodes) > 30: |
|
684 | if len(nodes) > 30: | |
685 | suf = '<br/>' + _(' and %s more') % (len(nodes) - 30) |
|
685 | suf = '<br/>' + _(' and %s more') % (len(nodes) - 30) | |
686 | return literal(pref + '<br/> '.join([x.path.decode('utf-8') for x in nodes[:30]]) + suf) |
|
686 | return literal(pref + '<br/> '.join([x.path.decode('utf-8', 'replace') for x in nodes[:30]]) + suf) | |
687 | else: |
|
687 | else: | |
688 | return ': ' + _('No Files') |
|
688 | return ': ' + _('No Files') |
@@ -81,7 +81,7 b'' | |||||
81 | <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span> |
|
81 | <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span> | |
82 | <div class="cs_files"> |
|
82 | <div class="cs_files"> | |
83 | %for change,filenode,diff,cs1,cs2 in c.changes: |
|
83 | %for change,filenode,diff,cs1,cs2 in c.changes: | |
84 | <div class="cs_${change}">${h.link_to(filenode.path.decode('utf-8'),h.url.current(anchor=h.repo_name_slug('C%s' % filenode.path.decode('utf-8'))))}</div> |
|
84 | <div class="cs_${change}">${h.link_to(filenode.path.decode('utf-8','replace'),h.url.current(anchor=h.repo_name_slug('C%s' % filenode.path.decode('utf-8','replace'))))}</div> | |
85 | %endfor |
|
85 | %endfor | |
86 | </div> |
|
86 | </div> | |
87 | </div> |
|
87 | </div> | |
@@ -92,19 +92,19 b'' | |||||
92 | %if change !='removed': |
|
92 | %if change !='removed': | |
93 | <div style="clear:both;height:10px"></div> |
|
93 | <div style="clear:both;height:10px"></div> | |
94 | <div class="diffblock"> |
|
94 | <div class="diffblock"> | |
95 | <div id="${h.repo_name_slug('C%s' % filenode.path.decode('utf-8'))}" class="code-header"> |
|
95 | <div id="${h.repo_name_slug('C%s' % filenode.path.decode('utf-8','replace'))}" class="code-header"> | |
96 | <div class="changeset_header"> |
|
96 | <div class="changeset_header"> | |
97 | <span class="changeset_file"> |
|
97 | <span class="changeset_file"> | |
98 | ${h.link_to_if(change!='removed',filenode.path.decode('utf-8'),h.url('files_home',repo_name=c.repo_name, |
|
98 | ${h.link_to_if(change!='removed',filenode.path.decode('utf-8','replace'),h.url('files_home',repo_name=c.repo_name, | |
99 | revision=filenode.changeset.raw_id,f_path=filenode.path.decode('utf-8')))} |
|
99 | revision=filenode.changeset.raw_id,f_path=filenode.path.decode('utf-8','replace')))} | |
100 | </span> |
|
100 | </span> | |
101 | %if 1: |
|
101 | %if 1: | |
102 | » <span>${h.link_to(_('diff'), |
|
102 | » <span>${h.link_to(_('diff'), | |
103 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8'),diff2=cs2,diff1=cs1,diff='diff'))}</span> |
|
103 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='diff'))}</span> | |
104 | » <span>${h.link_to(_('raw diff'), |
|
104 | » <span>${h.link_to(_('raw diff'), | |
105 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8'),diff2=cs2,diff1=cs1,diff='raw'))}</span> |
|
105 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='raw'))}</span> | |
106 | » <span>${h.link_to(_('download diff'), |
|
106 | » <span>${h.link_to(_('download diff'), | |
107 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8'),diff2=cs2,diff1=cs1,diff='download'))}</span> |
|
107 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='download'))}</span> | |
108 | %endif |
|
108 | %endif | |
109 | </div> |
|
109 | </div> | |
110 | </div> |
|
110 | </div> |
@@ -54,7 +54,7 b'' | |||||
54 | %for cs in c.cs_ranges: |
|
54 | %for cs in c.cs_ranges: | |
55 | <div class="cur_cs">r${cs}</div> |
|
55 | <div class="cur_cs">r${cs}</div> | |
56 | %for change,filenode,diff,cs1,cs2 in c.changes[cs.raw_id]: |
|
56 | %for change,filenode,diff,cs1,cs2 in c.changes[cs.raw_id]: | |
57 | <div class="cs_${change}">${h.link_to(filenode.path.decode('utf-8'),h.url.current(anchor=h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path.decode('utf-8')))))}</div> |
|
57 | <div class="cs_${change}">${h.link_to(filenode.path.decode('utf-8','replace'),h.url.current(anchor=h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path.decode('utf-8','replace')))))}</div> | |
58 | %endfor |
|
58 | %endfor | |
59 | %endfor |
|
59 | %endfor | |
60 | </div> |
|
60 | </div> | |
@@ -66,19 +66,19 b'' | |||||
66 | %if change !='removed': |
|
66 | %if change !='removed': | |
67 | <div style="clear:both;height:10px"></div> |
|
67 | <div style="clear:both;height:10px"></div> | |
68 | <div class="diffblock"> |
|
68 | <div class="diffblock"> | |
69 | <div id="${h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path.decode('utf-8')))}" class="code-header"> |
|
69 | <div id="${h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path.decode('utf-8','replace')))}" class="code-header"> | |
70 | <div class="changeset_header"> |
|
70 | <div class="changeset_header"> | |
71 | <span class="changeset_file"> |
|
71 | <span class="changeset_file"> | |
72 | ${h.link_to_if(change!='removed',filenode.path.decode('utf-8'),h.url('files_home',repo_name=c.repo_name, |
|
72 | ${h.link_to_if(change!='removed',filenode.path.decode('utf-8','replace'),h.url('files_home',repo_name=c.repo_name, | |
73 | revision=filenode.changeset.raw_id,f_path=filenode.path.decode('utf-8')))} |
|
73 | revision=filenode.changeset.raw_id,f_path=filenode.path.decode('utf-8','replace')))} | |
74 | </span> |
|
74 | </span> | |
75 | %if 1: |
|
75 | %if 1: | |
76 | » <span>${h.link_to(_('diff'), |
|
76 | » <span>${h.link_to(_('diff'), | |
77 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8'),diff2=cs2,diff1=cs1,diff='diff'))}</span> |
|
77 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='diff'))}</span> | |
78 | » <span>${h.link_to(_('raw diff'), |
|
78 | » <span>${h.link_to(_('raw diff'), | |
79 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8'),diff2=cs2,diff1=cs1,diff='raw'))}</span> |
|
79 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='raw'))}</span> | |
80 | » <span>${h.link_to(_('download diff'), |
|
80 | » <span>${h.link_to(_('download diff'), | |
81 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8'),diff2=cs2,diff1=cs1,diff='download'))}</span> |
|
81 | h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='download'))}</span> | |
82 | %endif |
|
82 | %endif | |
83 | </div> |
|
83 | </div> | |
84 | </div> |
|
84 | </div> |
@@ -66,7 +66,7 b'' | |||||
66 | %for cnt,node in enumerate(c.files_list): |
|
66 | %for cnt,node in enumerate(c.files_list): | |
67 | <tr class="parity${cnt%2}"> |
|
67 | <tr class="parity${cnt%2}"> | |
68 | <td> |
|
68 | <td> | |
69 | ${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))} |
|
69 | ${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=node.path.decode('utf-8','replace')),class_=file_class(node))} | |
70 | </td> |
|
70 | </td> | |
71 | <td> |
|
71 | <td> | |
72 | %if node.is_file(): |
|
72 | %if node.is_file(): |
General Comments 0
You need to be logged in to leave comments.
Login now