Show More
@@ -1,1023 +1,1025 b'' | |||
|
1 | 1 | <%namespace name="commentblock" file="/changeset/changeset_file_comment.mako"/> |
|
2 | 2 | |
|
3 | 3 | <%def name="diff_line_anchor(commit, filename, line, type)"><% |
|
4 | 4 | return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line) |
|
5 | 5 | %></%def> |
|
6 | 6 | |
|
7 | 7 | <%def name="action_class(action)"> |
|
8 | 8 | <% |
|
9 | 9 | return { |
|
10 | 10 | '-': 'cb-deletion', |
|
11 | 11 | '+': 'cb-addition', |
|
12 | 12 | ' ': 'cb-context', |
|
13 | 13 | }.get(action, 'cb-empty') |
|
14 | 14 | %> |
|
15 | 15 | </%def> |
|
16 | 16 | |
|
17 | 17 | <%def name="op_class(op_id)"> |
|
18 | 18 | <% |
|
19 | 19 | return { |
|
20 | 20 | DEL_FILENODE: 'deletion', # file deleted |
|
21 | 21 | BIN_FILENODE: 'warning' # binary diff hidden |
|
22 | 22 | }.get(op_id, 'addition') |
|
23 | 23 | %> |
|
24 | 24 | </%def> |
|
25 | 25 | |
|
26 | 26 | |
|
27 | 27 | |
|
28 | 28 | <%def name="render_diffset(diffset, commit=None, |
|
29 | 29 | |
|
30 | 30 | # collapse all file diff entries when there are more than this amount of files in the diff |
|
31 | 31 | collapse_when_files_over=20, |
|
32 | 32 | |
|
33 | 33 | # collapse lines in the diff when more than this amount of lines changed in the file diff |
|
34 | 34 | lines_changed_limit=500, |
|
35 | 35 | |
|
36 | 36 | # add a ruler at to the output |
|
37 | 37 | ruler_at_chars=0, |
|
38 | 38 | |
|
39 | 39 | # show inline comments |
|
40 | 40 | use_comments=False, |
|
41 | 41 | |
|
42 | 42 | # disable new comments |
|
43 | 43 | disable_new_comments=False, |
|
44 | 44 | |
|
45 | 45 | # special file-comments that were deleted in previous versions |
|
46 | 46 | # it's used for showing outdated comments for deleted files in a PR |
|
47 | 47 | deleted_files_comments=None, |
|
48 | 48 | |
|
49 | 49 | # for cache purpose |
|
50 | 50 | inline_comments=None, |
|
51 | 51 | |
|
52 | 52 | )"> |
|
53 | 53 | %if use_comments: |
|
54 | 54 | <div id="cb-comments-inline-container-template" class="js-template"> |
|
55 | 55 | ${inline_comments_container([], inline_comments)} |
|
56 | 56 | </div> |
|
57 | 57 | <div class="js-template" id="cb-comment-inline-form-template"> |
|
58 | 58 | <div class="comment-inline-form ac"> |
|
59 | 59 | |
|
60 | 60 | %if c.rhodecode_user.username != h.DEFAULT_USER: |
|
61 | 61 | ## render template for inline comments |
|
62 | 62 | ${commentblock.comment_form(form_type='inline')} |
|
63 | 63 | %else: |
|
64 | 64 | ${h.form('', class_='inline-form comment-form-login', method='get')} |
|
65 | 65 | <div class="pull-left"> |
|
66 | 66 | <div class="comment-help pull-right"> |
|
67 | 67 | ${_('You need to be logged in to leave comments.')} <a href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">${_('Login now')}</a> |
|
68 | 68 | </div> |
|
69 | 69 | </div> |
|
70 | 70 | <div class="comment-button pull-right"> |
|
71 | 71 | <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);"> |
|
72 | 72 | ${_('Cancel')} |
|
73 | 73 | </button> |
|
74 | 74 | </div> |
|
75 | 75 | <div class="clearfix"></div> |
|
76 | 76 | ${h.end_form()} |
|
77 | 77 | %endif |
|
78 | 78 | </div> |
|
79 | 79 | </div> |
|
80 | 80 | |
|
81 | 81 | %endif |
|
82 | 82 | <% |
|
83 | 83 | collapse_all = len(diffset.files) > collapse_when_files_over |
|
84 | 84 | %> |
|
85 | 85 | |
|
86 | 86 | %if c.user_session_attrs["diffmode"] == 'sideside': |
|
87 | 87 | <style> |
|
88 | 88 | .wrapper { |
|
89 | 89 | max-width: 1600px !important; |
|
90 | 90 | } |
|
91 | 91 | </style> |
|
92 | 92 | %endif |
|
93 | 93 | |
|
94 | 94 | %if ruler_at_chars: |
|
95 | 95 | <style> |
|
96 | 96 | .diff table.cb .cb-content:after { |
|
97 | 97 | content: ""; |
|
98 | 98 | border-left: 1px solid blue; |
|
99 | 99 | position: absolute; |
|
100 | 100 | top: 0; |
|
101 | 101 | height: 18px; |
|
102 | 102 | opacity: .2; |
|
103 | 103 | z-index: 10; |
|
104 | 104 | //## +5 to account for diff action (+/-) |
|
105 | 105 | left: ${ruler_at_chars + 5}ch; |
|
106 | 106 | </style> |
|
107 | 107 | %endif |
|
108 | 108 | |
|
109 | 109 | <div class="diffset ${disable_new_comments and 'diffset-comments-disabled'}"> |
|
110 | 110 | <div class="diffset-heading ${diffset.limited_diff and 'diffset-heading-warning' or ''}"> |
|
111 | 111 | %if commit: |
|
112 | 112 | <div class="pull-right"> |
|
113 | 113 | <a class="btn tooltip" title="${h.tooltip(_('Browse Files at revision {}').format(commit.raw_id))}" href="${h.route_path('repo_files',repo_name=diffset.repo_name, commit_id=commit.raw_id, f_path='')}"> |
|
114 | 114 | ${_('Browse Files')} |
|
115 | 115 | </a> |
|
116 | 116 | </div> |
|
117 | 117 | %endif |
|
118 | 118 | <h2 class="clearinner"> |
|
119 | 119 | ## invidual commit |
|
120 | 120 | % if commit: |
|
121 | 121 | <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.route_path('repo_commit',repo_name=diffset.repo_name,commit_id=commit.raw_id)}">${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}</a> - |
|
122 | 122 | ${h.age_component(commit.date)} |
|
123 | 123 | % if diffset.limited_diff: |
|
124 | 124 | - ${_('The requested commit is too big and content was truncated.')} |
|
125 | 125 | ${_ungettext('%(num)s file changed.', '%(num)s files changed.', diffset.changed_files) % {'num': diffset.changed_files}} |
|
126 | 126 | <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a> |
|
127 | 127 | % elif hasattr(c, 'commit_ranges') and len(c.commit_ranges) > 1: |
|
128 | 128 | ## compare diff, has no file-selector and we want to show stats anyway |
|
129 | 129 | ${_ungettext('{num} file changed: {linesadd} inserted, ''{linesdel} deleted', |
|
130 | 130 | '{num} files changed: {linesadd} inserted, {linesdel} deleted', diffset.changed_files) \ |
|
131 | 131 | .format(num=diffset.changed_files, linesadd=diffset.lines_added, linesdel=diffset.lines_deleted)} |
|
132 | 132 | % endif |
|
133 | 133 | % else: |
|
134 | 134 | ## pull requests/compare |
|
135 | 135 | ${_('File Changes')} |
|
136 | 136 | % endif |
|
137 | 137 | |
|
138 | 138 | </h2> |
|
139 | 139 | </div> |
|
140 | 140 | |
|
141 | 141 | %if diffset.has_hidden_changes: |
|
142 | 142 | <p class="empty_data">${_('Some changes may be hidden')}</p> |
|
143 | 143 | %elif not diffset.files: |
|
144 | 144 | <p class="empty_data">${_('No files')}</p> |
|
145 | 145 | %endif |
|
146 | 146 | |
|
147 | 147 | <div class="filediffs"> |
|
148 | 148 | |
|
149 | 149 | ## initial value could be marked as False later on |
|
150 | 150 | <% over_lines_changed_limit = False %> |
|
151 | 151 | %for i, filediff in enumerate(diffset.files): |
|
152 | 152 | |
|
153 | 153 | <% |
|
154 | 154 | lines_changed = filediff.patch['stats']['added'] + filediff.patch['stats']['deleted'] |
|
155 | 155 | over_lines_changed_limit = lines_changed > lines_changed_limit |
|
156 | 156 | %> |
|
157 | 157 | ## anchor with support of sticky header |
|
158 | 158 | <div class="anchor" id="a_${h.FID(filediff.raw_id, filediff.patch['filename'])}"></div> |
|
159 | 159 | |
|
160 | 160 | <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox" onchange="updateSticky();"> |
|
161 | 161 | <div |
|
162 | 162 | class="filediff" |
|
163 | 163 | data-f-path="${filediff.patch['filename']}" |
|
164 | 164 | data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" |
|
165 | 165 | > |
|
166 | 166 | <label for="filediff-collapse-${id(filediff)}" class="filediff-heading"> |
|
167 | 167 | <div class="filediff-collapse-indicator"></div> |
|
168 | 168 | ${diff_ops(filediff)} |
|
169 | 169 | </label> |
|
170 | 170 | |
|
171 | 171 | ${diff_menu(filediff, use_comments=use_comments)} |
|
172 | 172 | <table data-f-path="${filediff.patch['filename']}" data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" class="code-visible-block cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}"> |
|
173 | 173 | |
|
174 | 174 | ## new/deleted/empty content case |
|
175 | 175 | % if not filediff.hunks: |
|
176 | 176 | ## Comment container, on "fakes" hunk that contains all data to render comments |
|
177 | 177 | ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments)} |
|
178 | 178 | % endif |
|
179 | 179 | |
|
180 | 180 | %if filediff.limited_diff: |
|
181 | 181 | <tr class="cb-warning cb-collapser"> |
|
182 | 182 | <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}> |
|
183 | 183 | ${_('The requested commit is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a> |
|
184 | 184 | </td> |
|
185 | 185 | </tr> |
|
186 | 186 | %else: |
|
187 | 187 | %if over_lines_changed_limit: |
|
188 | 188 | <tr class="cb-warning cb-collapser"> |
|
189 | 189 | <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}> |
|
190 | 190 | ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)} |
|
191 | 191 | <a href="#" class="cb-expand" |
|
192 | 192 | onclick="$(this).closest('table').removeClass('cb-collapsed'); updateSticky(); return false;">${_('Show them')} |
|
193 | 193 | </a> |
|
194 | 194 | <a href="#" class="cb-collapse" |
|
195 | 195 | onclick="$(this).closest('table').addClass('cb-collapsed'); updateSticky(); return false;">${_('Hide them')} |
|
196 | 196 | </a> |
|
197 | 197 | </td> |
|
198 | 198 | </tr> |
|
199 | 199 | %endif |
|
200 | 200 | %endif |
|
201 | 201 | |
|
202 | 202 | % for hunk in filediff.hunks: |
|
203 | 203 | <tr class="cb-hunk"> |
|
204 | 204 | <td ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=3' or '')}> |
|
205 | 205 | ## TODO: dan: add ajax loading of more context here |
|
206 | 206 | ## <a href="#"> |
|
207 | 207 | <i class="icon-more"></i> |
|
208 | 208 | ## </a> |
|
209 | 209 | </td> |
|
210 | 210 | <td ${(c.user_session_attrs["diffmode"] == 'sideside' and 'colspan=5' or '')}> |
|
211 | 211 | @@ |
|
212 | 212 | -${hunk.source_start},${hunk.source_length} |
|
213 | 213 | +${hunk.target_start},${hunk.target_length} |
|
214 | 214 | ${hunk.section_header} |
|
215 | 215 | </td> |
|
216 | 216 | </tr> |
|
217 | 217 | ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments)} |
|
218 | 218 | % endfor |
|
219 | 219 | |
|
220 | 220 | <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %> |
|
221 | 221 | |
|
222 | 222 | ## outdated comments that do not fit into currently displayed lines |
|
223 | 223 | % for lineno, comments in unmatched_comments.items(): |
|
224 | 224 | |
|
225 | 225 | %if c.user_session_attrs["diffmode"] == 'unified': |
|
226 | 226 | % if loop.index == 0: |
|
227 | 227 | <tr class="cb-hunk"> |
|
228 | 228 | <td colspan="3"></td> |
|
229 | 229 | <td> |
|
230 | 230 | <div> |
|
231 | 231 | ${_('Unmatched inline comments below')} |
|
232 | 232 | </div> |
|
233 | 233 | </td> |
|
234 | 234 | </tr> |
|
235 | 235 | % endif |
|
236 | 236 | <tr class="cb-line"> |
|
237 | 237 | <td class="cb-data cb-context"></td> |
|
238 | 238 | <td class="cb-lineno cb-context"></td> |
|
239 | 239 | <td class="cb-lineno cb-context"></td> |
|
240 | 240 | <td class="cb-content cb-context"> |
|
241 | 241 | ${inline_comments_container(comments, inline_comments)} |
|
242 | 242 | </td> |
|
243 | 243 | </tr> |
|
244 | 244 | %elif c.user_session_attrs["diffmode"] == 'sideside': |
|
245 | 245 | % if loop.index == 0: |
|
246 | 246 | <tr class="cb-comment-info"> |
|
247 | 247 | <td colspan="2"></td> |
|
248 | 248 | <td class="cb-line"> |
|
249 | 249 | <div> |
|
250 | 250 | ${_('Unmatched inline comments below')} |
|
251 | 251 | </div> |
|
252 | 252 | </td> |
|
253 | 253 | <td colspan="2"></td> |
|
254 | 254 | <td class="cb-line"> |
|
255 | 255 | <div> |
|
256 | 256 | ${_('Unmatched comments below')} |
|
257 | 257 | </div> |
|
258 | 258 | </td> |
|
259 | 259 | </tr> |
|
260 | 260 | % endif |
|
261 | 261 | <tr class="cb-line"> |
|
262 | 262 | <td class="cb-data cb-context"></td> |
|
263 | 263 | <td class="cb-lineno cb-context"></td> |
|
264 | 264 | <td class="cb-content cb-context"> |
|
265 | 265 | % if lineno.startswith('o'): |
|
266 | 266 | ${inline_comments_container(comments, inline_comments)} |
|
267 | 267 | % endif |
|
268 | 268 | </td> |
|
269 | 269 | |
|
270 | 270 | <td class="cb-data cb-context"></td> |
|
271 | 271 | <td class="cb-lineno cb-context"></td> |
|
272 | 272 | <td class="cb-content cb-context"> |
|
273 | 273 | % if lineno.startswith('n'): |
|
274 | 274 | ${inline_comments_container(comments, inline_comments)} |
|
275 | 275 | % endif |
|
276 | 276 | </td> |
|
277 | 277 | </tr> |
|
278 | 278 | %endif |
|
279 | 279 | |
|
280 | 280 | % endfor |
|
281 | 281 | |
|
282 | 282 | </table> |
|
283 | 283 | </div> |
|
284 | 284 | %endfor |
|
285 | 285 | |
|
286 | 286 | ## outdated comments that are made for a file that has been deleted |
|
287 | 287 | % for filename, comments_dict in (deleted_files_comments or {}).items(): |
|
288 | 288 | <% |
|
289 | 289 | display_state = 'display: none' |
|
290 | 290 | open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False] |
|
291 | 291 | if open_comments_in_file: |
|
292 | 292 | display_state = '' |
|
293 | 293 | %> |
|
294 | 294 | <div class="filediffs filediff-outdated" style="${display_state}"> |
|
295 | 295 | <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox" onchange="updateSticky();"> |
|
296 | 296 | <div class="filediff" data-f-path="${filename}" id="a_${h.FID(filediff.raw_id, filename)}"> |
|
297 | 297 | <label for="filediff-collapse-${id(filename)}" class="filediff-heading"> |
|
298 | 298 | <div class="filediff-collapse-indicator"></div> |
|
299 | 299 | <span class="pill"> |
|
300 | 300 | ## file was deleted |
|
301 | 301 | <strong>${filename}</strong> |
|
302 | 302 | </span> |
|
303 | 303 | <span class="pill-group" style="float: left"> |
|
304 | 304 | ## file op, doesn't need translation |
|
305 | 305 | <span class="pill" op="removed">removed in this version</span> |
|
306 | 306 | </span> |
|
307 | 307 | <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filename)}">ΒΆ</a> |
|
308 | 308 | <span class="pill-group" style="float: right"> |
|
309 | 309 | <span class="pill" op="deleted">-${comments_dict['stats']}</span> |
|
310 | 310 | </span> |
|
311 | 311 | </label> |
|
312 | 312 | |
|
313 | 313 | <table class="cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}"> |
|
314 | 314 | <tr> |
|
315 | 315 | % if c.user_session_attrs["diffmode"] == 'unified': |
|
316 | 316 | <td></td> |
|
317 | 317 | %endif |
|
318 | 318 | |
|
319 | 319 | <td></td> |
|
320 | 320 | <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=5')}> |
|
321 | 321 | ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')} |
|
322 | 322 | </td> |
|
323 | 323 | </tr> |
|
324 | 324 | %if c.user_session_attrs["diffmode"] == 'unified': |
|
325 | 325 | <tr class="cb-line"> |
|
326 | 326 | <td class="cb-data cb-context"></td> |
|
327 | 327 | <td class="cb-lineno cb-context"></td> |
|
328 | 328 | <td class="cb-lineno cb-context"></td> |
|
329 | 329 | <td class="cb-content cb-context"> |
|
330 | 330 | ${inline_comments_container(comments_dict['comments'], inline_comments)} |
|
331 | 331 | </td> |
|
332 | 332 | </tr> |
|
333 | 333 | %elif c.user_session_attrs["diffmode"] == 'sideside': |
|
334 | 334 | <tr class="cb-line"> |
|
335 | 335 | <td class="cb-data cb-context"></td> |
|
336 | 336 | <td class="cb-lineno cb-context"></td> |
|
337 | 337 | <td class="cb-content cb-context"></td> |
|
338 | 338 | |
|
339 | 339 | <td class="cb-data cb-context"></td> |
|
340 | 340 | <td class="cb-lineno cb-context"></td> |
|
341 | 341 | <td class="cb-content cb-context"> |
|
342 | 342 | ${inline_comments_container(comments_dict['comments'], inline_comments)} |
|
343 | 343 | </td> |
|
344 | 344 | </tr> |
|
345 | 345 | %endif |
|
346 | 346 | </table> |
|
347 | 347 | </div> |
|
348 | 348 | </div> |
|
349 | 349 | % endfor |
|
350 | 350 | |
|
351 | 351 | </div> |
|
352 | 352 | </div> |
|
353 | 353 | </%def> |
|
354 | 354 | |
|
355 | 355 | <%def name="diff_ops(filediff)"> |
|
356 | 356 | <% |
|
357 | 357 | from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \ |
|
358 | 358 | MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE |
|
359 | 359 | %> |
|
360 | 360 | <span class="pill"> |
|
361 | 361 | %if filediff.source_file_path and filediff.target_file_path: |
|
362 | 362 | %if filediff.source_file_path != filediff.target_file_path: |
|
363 | 363 | ## file was renamed, or copied |
|
364 | 364 | %if RENAMED_FILENODE in filediff.patch['stats']['ops']: |
|
365 | 365 | <strong>${filediff.target_file_path}</strong> β¬ <del>${filediff.source_file_path}</del> |
|
366 | 366 | <% final_path = filediff.target_file_path %> |
|
367 | 367 | %elif COPIED_FILENODE in filediff.patch['stats']['ops']: |
|
368 | 368 | <strong>${filediff.target_file_path}</strong> β¬ ${filediff.source_file_path} |
|
369 | 369 | <% final_path = filediff.target_file_path %> |
|
370 | 370 | %endif |
|
371 | 371 | %else: |
|
372 | 372 | ## file was modified |
|
373 | 373 | <strong>${filediff.source_file_path}</strong> |
|
374 | 374 | <% final_path = filediff.source_file_path %> |
|
375 | 375 | %endif |
|
376 | 376 | %else: |
|
377 | 377 | %if filediff.source_file_path: |
|
378 | 378 | ## file was deleted |
|
379 | 379 | <strong>${filediff.source_file_path}</strong> |
|
380 | 380 | <% final_path = filediff.source_file_path %> |
|
381 | 381 | %else: |
|
382 | 382 | ## file was added |
|
383 | 383 | <strong>${filediff.target_file_path}</strong> |
|
384 | 384 | <% final_path = filediff.target_file_path %> |
|
385 | 385 | %endif |
|
386 | 386 | %endif |
|
387 | 387 | <i style="color: #aaa" class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy the full path')}" onclick="return false;"></i> |
|
388 | 388 | </span> |
|
389 | 389 | ## anchor link |
|
390 | 390 | <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filediff.patch['filename'])}">ΒΆ</a> |
|
391 | 391 | |
|
392 | 392 | <span class="pill-group" style="float: right"> |
|
393 | 393 | |
|
394 | 394 | ## ops pills |
|
395 | 395 | %if filediff.limited_diff: |
|
396 | 396 | <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span> |
|
397 | 397 | %endif |
|
398 | 398 | |
|
399 | 399 | %if NEW_FILENODE in filediff.patch['stats']['ops']: |
|
400 | 400 | <span class="pill" op="created">created</span> |
|
401 | 401 | %if filediff['target_mode'].startswith('120'): |
|
402 | 402 | <span class="pill" op="symlink">symlink</span> |
|
403 | 403 | %else: |
|
404 | 404 | <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span> |
|
405 | 405 | %endif |
|
406 | 406 | %endif |
|
407 | 407 | |
|
408 | 408 | %if RENAMED_FILENODE in filediff.patch['stats']['ops']: |
|
409 | 409 | <span class="pill" op="renamed">renamed</span> |
|
410 | 410 | %endif |
|
411 | 411 | |
|
412 | 412 | %if COPIED_FILENODE in filediff.patch['stats']['ops']: |
|
413 | 413 | <span class="pill" op="copied">copied</span> |
|
414 | 414 | %endif |
|
415 | 415 | |
|
416 | 416 | %if DEL_FILENODE in filediff.patch['stats']['ops']: |
|
417 | 417 | <span class="pill" op="removed">removed</span> |
|
418 | 418 | %endif |
|
419 | 419 | |
|
420 | 420 | %if CHMOD_FILENODE in filediff.patch['stats']['ops']: |
|
421 | 421 | <span class="pill" op="mode"> |
|
422 | 422 | ${nice_mode(filediff['source_mode'])} β‘ ${nice_mode(filediff['target_mode'])} |
|
423 | 423 | </span> |
|
424 | 424 | %endif |
|
425 | 425 | |
|
426 | 426 | %if BIN_FILENODE in filediff.patch['stats']['ops']: |
|
427 | 427 | <span class="pill" op="binary">binary</span> |
|
428 | 428 | %if MOD_FILENODE in filediff.patch['stats']['ops']: |
|
429 | 429 | <span class="pill" op="modified">modified</span> |
|
430 | 430 | %endif |
|
431 | 431 | %endif |
|
432 | 432 | |
|
433 | 433 | <span class="pill" op="added">${('+' if filediff.patch['stats']['added'] else '')}${filediff.patch['stats']['added']}</span> |
|
434 | 434 | <span class="pill" op="deleted">${((h.safe_int(filediff.patch['stats']['deleted']) or 0) * -1)}</span> |
|
435 | 435 | |
|
436 | 436 | </span> |
|
437 | 437 | |
|
438 | 438 | </%def> |
|
439 | 439 | |
|
440 | 440 | <%def name="nice_mode(filemode)"> |
|
441 | 441 | ${(filemode.startswith('100') and filemode[3:] or filemode)} |
|
442 | 442 | </%def> |
|
443 | 443 | |
|
444 | 444 | <%def name="diff_menu(filediff, use_comments=False)"> |
|
445 | 445 | <div class="filediff-menu"> |
|
446 | 446 | |
|
447 | 447 | %if filediff.diffset.source_ref: |
|
448 | 448 | |
|
449 | 449 | ## FILE BEFORE CHANGES |
|
450 | 450 | %if filediff.operation in ['D', 'M']: |
|
451 | 451 | <a |
|
452 | 452 | class="tooltip" |
|
453 | 453 | href="${h.route_path('repo_files',repo_name=filediff.diffset.target_repo_name,commit_id=filediff.diffset.source_ref,f_path=filediff.source_file_path)}" |
|
454 | 454 | title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}" |
|
455 | 455 | > |
|
456 | 456 | ${_('Show file before')} |
|
457 | 457 | </a> | |
|
458 | 458 | %else: |
|
459 | 459 | <span |
|
460 | 460 | class="tooltip" |
|
461 | 461 | title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}" |
|
462 | 462 | > |
|
463 | 463 | ${_('Show file before')} |
|
464 | 464 | </span> | |
|
465 | 465 | %endif |
|
466 | 466 | |
|
467 | 467 | ## FILE AFTER CHANGES |
|
468 | 468 | %if filediff.operation in ['A', 'M']: |
|
469 | 469 | <a |
|
470 | 470 | class="tooltip" |
|
471 | 471 | href="${h.route_path('repo_files',repo_name=filediff.diffset.source_repo_name,commit_id=filediff.diffset.target_ref,f_path=filediff.target_file_path)}" |
|
472 | 472 | title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}" |
|
473 | 473 | > |
|
474 | 474 | ${_('Show file after')} |
|
475 | 475 | </a> |
|
476 | 476 | %else: |
|
477 | 477 | <span |
|
478 | 478 | class="tooltip" |
|
479 | 479 | title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}" |
|
480 | 480 | > |
|
481 | 481 | ${_('Show file after')} |
|
482 | 482 | </span> |
|
483 | 483 | %endif |
|
484 | 484 | |
|
485 | 485 | % if use_comments: |
|
486 | 486 | | |
|
487 | 487 | <a href="#" onclick="return Rhodecode.comments.toggleComments(this);"> |
|
488 | 488 | <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span> |
|
489 | 489 | </a> |
|
490 | 490 | % endif |
|
491 | 491 | |
|
492 | 492 | %endif |
|
493 | 493 | |
|
494 | 494 | </div> |
|
495 | 495 | </%def> |
|
496 | 496 | |
|
497 | 497 | |
|
498 | 498 | <%def name="inline_comments_container(comments, inline_comments)"> |
|
499 | 499 | <div class="inline-comments"> |
|
500 | 500 | %for comment in comments: |
|
501 | 501 | ${commentblock.comment_block(comment, inline=True)} |
|
502 | 502 | %endfor |
|
503 | 503 | % if comments and comments[-1].outdated: |
|
504 | 504 | <span class="btn btn-secondary cb-comment-add-button comment-outdated}" |
|
505 | 505 | style="display: none;}"> |
|
506 | 506 | ${_('Add another comment')} |
|
507 | 507 | </span> |
|
508 | 508 | % else: |
|
509 | 509 | <span onclick="return Rhodecode.comments.createComment(this)" |
|
510 | 510 | class="btn btn-secondary cb-comment-add-button"> |
|
511 | 511 | ${_('Add another comment')} |
|
512 | 512 | </span> |
|
513 | 513 | % endif |
|
514 | 514 | |
|
515 | 515 | </div> |
|
516 | 516 | </%def> |
|
517 | 517 | |
|
518 | 518 | <%! |
|
519 | 519 | def get_comments_for(diff_type, comments, filename, line_version, line_number): |
|
520 | 520 | if hasattr(filename, 'unicode_path'): |
|
521 | 521 | filename = filename.unicode_path |
|
522 | 522 | |
|
523 | 523 | if not isinstance(filename, basestring): |
|
524 | 524 | return None |
|
525 | 525 | |
|
526 | 526 | line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12 |
|
527 | 527 | |
|
528 | 528 | if comments and filename in comments: |
|
529 | 529 | file_comments = comments[filename] |
|
530 | 530 | if line_key in file_comments: |
|
531 | 531 | data = file_comments.pop(line_key) |
|
532 | 532 | return data |
|
533 | 533 | %> |
|
534 | 534 | |
|
535 | 535 | <%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None)"> |
|
536 | 536 | %for i, line in enumerate(hunk.sideside): |
|
537 | 537 | <% |
|
538 | 538 | old_line_anchor, new_line_anchor = None, None |
|
539 | 539 | |
|
540 | 540 | if line.original.lineno: |
|
541 | 541 | old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, line.original.lineno, 'o') |
|
542 | 542 | if line.modified.lineno: |
|
543 | 543 | new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, line.modified.lineno, 'n') |
|
544 | 544 | %> |
|
545 | 545 | |
|
546 | 546 | <tr class="cb-line"> |
|
547 | 547 | <td class="cb-data ${action_class(line.original.action)}" |
|
548 | 548 | data-line-no="${line.original.lineno}" |
|
549 | 549 | > |
|
550 | 550 | <div> |
|
551 | 551 | |
|
552 | 552 | <% line_old_comments = None %> |
|
553 | 553 | %if line.original.get_comment_args: |
|
554 | 554 | <% line_old_comments = get_comments_for('side-by-side', inline_comments, *line.original.get_comment_args) %> |
|
555 | 555 | %endif |
|
556 | 556 | %if line_old_comments: |
|
557 | 557 | <% has_outdated = any([x.outdated for x in line_old_comments]) %> |
|
558 | 558 | % if has_outdated: |
|
559 | 559 | <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
560 | 560 | % else: |
|
561 | 561 | <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
562 | 562 | % endif |
|
563 | 563 | %endif |
|
564 | 564 | </div> |
|
565 | 565 | </td> |
|
566 | 566 | <td class="cb-lineno ${action_class(line.original.action)}" |
|
567 | 567 | data-line-no="${line.original.lineno}" |
|
568 | 568 | %if old_line_anchor: |
|
569 | 569 | id="${old_line_anchor}" |
|
570 | 570 | %endif |
|
571 | 571 | > |
|
572 | 572 | %if line.original.lineno: |
|
573 | 573 | <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a> |
|
574 | 574 | %endif |
|
575 | 575 | </td> |
|
576 | 576 | <td class="cb-content ${action_class(line.original.action)}" |
|
577 | 577 | data-line-no="o${line.original.lineno}" |
|
578 | 578 | > |
|
579 | 579 | %if use_comments and line.original.lineno: |
|
580 | 580 | ${render_add_comment_button()} |
|
581 | 581 | %endif |
|
582 | 582 | <span class="cb-code"><span class="cb-action ${action_class(line.original.action)}"></span>${line.original.content or '' | n}</span> |
|
583 | 583 | |
|
584 | 584 | %if use_comments and line.original.lineno and line_old_comments: |
|
585 | 585 | ${inline_comments_container(line_old_comments, inline_comments)} |
|
586 | 586 | %endif |
|
587 | 587 | |
|
588 | 588 | </td> |
|
589 | 589 | <td class="cb-data ${action_class(line.modified.action)}" |
|
590 | 590 | data-line-no="${line.modified.lineno}" |
|
591 | 591 | > |
|
592 | 592 | <div> |
|
593 | 593 | |
|
594 | 594 | %if line.modified.get_comment_args: |
|
595 | 595 | <% line_new_comments = get_comments_for('side-by-side', inline_comments, *line.modified.get_comment_args) %> |
|
596 | 596 | %else: |
|
597 | 597 | <% line_new_comments = None%> |
|
598 | 598 | %endif |
|
599 | 599 | %if line_new_comments: |
|
600 | 600 | <% has_outdated = any([x.outdated for x in line_new_comments]) %> |
|
601 | 601 | % if has_outdated: |
|
602 | 602 | <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
603 | 603 | % else: |
|
604 | 604 | <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
605 | 605 | % endif |
|
606 | 606 | %endif |
|
607 | 607 | </div> |
|
608 | 608 | </td> |
|
609 | 609 | <td class="cb-lineno ${action_class(line.modified.action)}" |
|
610 | 610 | data-line-no="${line.modified.lineno}" |
|
611 | 611 | %if new_line_anchor: |
|
612 | 612 | id="${new_line_anchor}" |
|
613 | 613 | %endif |
|
614 | 614 | > |
|
615 | 615 | %if line.modified.lineno: |
|
616 | 616 | <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a> |
|
617 | 617 | %endif |
|
618 | 618 | </td> |
|
619 | 619 | <td class="cb-content ${action_class(line.modified.action)}" |
|
620 | 620 | data-line-no="n${line.modified.lineno}" |
|
621 | 621 | > |
|
622 | 622 | %if use_comments and line.modified.lineno: |
|
623 | 623 | ${render_add_comment_button()} |
|
624 | 624 | %endif |
|
625 | 625 | <span class="cb-code"><span class="cb-action ${action_class(line.modified.action)}"></span>${line.modified.content or '' | n}</span> |
|
626 | 626 | %if use_comments and line.modified.lineno and line_new_comments: |
|
627 | 627 | ${inline_comments_container(line_new_comments, inline_comments)} |
|
628 | 628 | %endif |
|
629 | 629 | </td> |
|
630 | 630 | </tr> |
|
631 | 631 | %endfor |
|
632 | 632 | </%def> |
|
633 | 633 | |
|
634 | 634 | |
|
635 | 635 | <%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False, inline_comments=None)"> |
|
636 | 636 | %for old_line_no, new_line_no, action, content, comments_args in hunk.unified: |
|
637 | 637 | |
|
638 | 638 | <% |
|
639 | 639 | old_line_anchor, new_line_anchor = None, None |
|
640 | 640 | if old_line_no: |
|
641 | 641 | old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, old_line_no, 'o') |
|
642 | 642 | if new_line_no: |
|
643 | 643 | new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, new_line_no, 'n') |
|
644 | 644 | %> |
|
645 | 645 | <tr class="cb-line"> |
|
646 | 646 | <td class="cb-data ${action_class(action)}"> |
|
647 | 647 | <div> |
|
648 | 648 | |
|
649 | 649 | %if comments_args: |
|
650 | 650 | <% comments = get_comments_for('unified', inline_comments, *comments_args) %> |
|
651 | 651 | %else: |
|
652 | 652 | <% comments = None %> |
|
653 | 653 | %endif |
|
654 | 654 | |
|
655 | 655 | % if comments: |
|
656 | 656 | <% has_outdated = any([x.outdated for x in comments]) %> |
|
657 | 657 | % if has_outdated: |
|
658 | 658 | <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
659 | 659 | % else: |
|
660 | 660 | <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
661 | 661 | % endif |
|
662 | 662 | % endif |
|
663 | 663 | </div> |
|
664 | 664 | </td> |
|
665 | 665 | <td class="cb-lineno ${action_class(action)}" |
|
666 | 666 | data-line-no="${old_line_no}" |
|
667 | 667 | %if old_line_anchor: |
|
668 | 668 | id="${old_line_anchor}" |
|
669 | 669 | %endif |
|
670 | 670 | > |
|
671 | 671 | %if old_line_anchor: |
|
672 | 672 | <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a> |
|
673 | 673 | %endif |
|
674 | 674 | </td> |
|
675 | 675 | <td class="cb-lineno ${action_class(action)}" |
|
676 | 676 | data-line-no="${new_line_no}" |
|
677 | 677 | %if new_line_anchor: |
|
678 | 678 | id="${new_line_anchor}" |
|
679 | 679 | %endif |
|
680 | 680 | > |
|
681 | 681 | %if new_line_anchor: |
|
682 | 682 | <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a> |
|
683 | 683 | %endif |
|
684 | 684 | </td> |
|
685 | 685 | <td class="cb-content ${action_class(action)}" |
|
686 | 686 | data-line-no="${(new_line_no and 'n' or 'o')}${(new_line_no or old_line_no)}" |
|
687 | 687 | > |
|
688 | 688 | %if use_comments: |
|
689 | 689 | ${render_add_comment_button()} |
|
690 | 690 | %endif |
|
691 | 691 | <span class="cb-code"><span class="cb-action ${action_class(action)}"></span> ${content or '' | n}</span> |
|
692 | 692 | %if use_comments and comments: |
|
693 | 693 | ${inline_comments_container(comments, inline_comments)} |
|
694 | 694 | %endif |
|
695 | 695 | </td> |
|
696 | 696 | </tr> |
|
697 | 697 | %endfor |
|
698 | 698 | </%def> |
|
699 | 699 | |
|
700 | 700 | |
|
701 | 701 | <%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments)"> |
|
702 | 702 | % if diff_mode == 'unified': |
|
703 | 703 | ${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments)} |
|
704 | 704 | % elif diff_mode == 'sideside': |
|
705 | 705 | ${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments)} |
|
706 | 706 | % else: |
|
707 | 707 | <tr class="cb-line"> |
|
708 | 708 | <td>unknown diff mode</td> |
|
709 | 709 | </tr> |
|
710 | 710 | % endif |
|
711 | 711 | </%def>file changes |
|
712 | 712 | |
|
713 | 713 | |
|
714 | 714 | <%def name="render_add_comment_button()"> |
|
715 | 715 | <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)"> |
|
716 | 716 | <span><i class="icon-comment"></i></span> |
|
717 | 717 | </button> |
|
718 | 718 | </%def> |
|
719 | 719 | |
|
720 | 720 | <%def name="render_diffset_menu(diffset=None, range_diff_on=None)"> |
|
721 | 721 | |
|
722 | 722 | <div id="diff-file-sticky" class="diffset-menu clearinner"> |
|
723 | 723 | ## auto adjustable |
|
724 | 724 | <div class="sidebar__inner"> |
|
725 | 725 | <div class="sidebar__bar"> |
|
726 | 726 | <div class="pull-right"> |
|
727 | 727 | <div class="btn-group"> |
|
728 | 728 | |
|
729 | 729 | ## DIFF OPTIONS via Select2 |
|
730 | 730 | <div class="pull-left"> |
|
731 | 731 | ${h.hidden('diff_menu')} |
|
732 | 732 | </div> |
|
733 | 733 | |
|
734 | 734 | <a |
|
735 | 735 | class="btn ${(c.user_session_attrs["diffmode"] == 'sideside' and 'btn-primary')} tooltip" |
|
736 | 736 | title="${h.tooltip(_('View side by side'))}" |
|
737 | 737 | href="${h.current_route_path(request, diffmode='sideside')}"> |
|
738 | 738 | <span>${_('Side by Side')}</span> |
|
739 | 739 | </a> |
|
740 | 740 | |
|
741 | 741 | <a |
|
742 | 742 | class="btn ${(c.user_session_attrs["diffmode"] == 'unified' and 'btn-primary')} tooltip" |
|
743 | 743 | title="${h.tooltip(_('View unified'))}" href="${h.current_route_path(request, diffmode='unified')}"> |
|
744 | 744 | <span>${_('Unified')}</span> |
|
745 | 745 | </a> |
|
746 | 746 | |
|
747 | 747 | % if range_diff_on is True: |
|
748 | 748 | <a |
|
749 | 749 | title="${_('Turn off: Show the diff as commit range')}" |
|
750 | 750 | class="btn btn-primary" |
|
751 | 751 | href="${h.current_route_path(request, **{"range-diff":"0"})}"> |
|
752 | 752 | <span>${_('Range Diff')}</span> |
|
753 | 753 | </a> |
|
754 | 754 | % elif range_diff_on is False: |
|
755 | 755 | <a |
|
756 | 756 | title="${_('Show the diff as commit range')}" |
|
757 | 757 | class="btn" |
|
758 | 758 | href="${h.current_route_path(request, **{"range-diff":"1"})}"> |
|
759 | 759 | <span>${_('Range Diff')}</span> |
|
760 | 760 | </a> |
|
761 | 761 | % endif |
|
762 | 762 | </div> |
|
763 | 763 | </div> |
|
764 | 764 | <div class="pull-left"> |
|
765 | 765 | <div class="btn-group"> |
|
766 | 766 | <div class="pull-left"> |
|
767 | 767 | ${h.hidden('file_filter')} |
|
768 | 768 | </div> |
|
769 | 769 | <a |
|
770 | 770 | class="btn" |
|
771 | 771 | href="#" |
|
772 | 772 | onclick="$('input[class=filediff-collapse-state]').prop('checked', false); updateSticky(); return false">${_('Expand All Files')}</a> |
|
773 | 773 | <a |
|
774 | 774 | class="btn" |
|
775 | 775 | href="#" |
|
776 | 776 | onclick="$('input[class=filediff-collapse-state]').prop('checked', true); updateSticky(); return false">${_('Collapse All Files')}</a> |
|
777 | 777 | </div> |
|
778 | 778 | </div> |
|
779 | 779 | </div> |
|
780 | 780 | <div class="fpath-placeholder"> |
|
781 | 781 | <i class="icon-file-text"></i> |
|
782 | 782 | <strong class="fpath-placeholder-text"> |
|
783 | 783 | Context file: |
|
784 | 784 | </strong> |
|
785 | 785 | </div> |
|
786 | 786 | <div class="sidebar_inner_shadow"></div> |
|
787 | 787 | </div> |
|
788 | 788 | </div> |
|
789 | 789 | |
|
790 | 790 | % if diffset: |
|
791 | 791 | |
|
792 | 792 | %if diffset.limited_diff: |
|
793 | 793 | <% file_placeholder = _ungettext('%(num)s file changed', '%(num)s files changed', diffset.changed_files) % {'num': diffset.changed_files} %> |
|
794 | 794 | %else: |
|
795 | 795 | <% file_placeholder = _ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted', '%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}%> |
|
796 | 796 | %endif |
|
797 | 797 | ## case on range-diff placeholder needs to be updated |
|
798 | 798 | % if range_diff_on is True: |
|
799 | 799 | <% file_placeholder = _('Disabled on range diff') %> |
|
800 | 800 | % endif |
|
801 | 801 | |
|
802 | 802 | <script> |
|
803 | 803 | |
|
804 | 804 | var feedFilesOptions = function (query, initialData) { |
|
805 | 805 | var data = {results: []}; |
|
806 | 806 | var isQuery = typeof query.term !== 'undefined'; |
|
807 | 807 | |
|
808 | 808 | var section = _gettext('Changed files'); |
|
809 | 809 | var filteredData = []; |
|
810 | 810 | |
|
811 | 811 | //filter results |
|
812 | 812 | $.each(initialData.results, function (idx, value) { |
|
813 | 813 | |
|
814 | 814 | if (!isQuery || query.term.length === 0 || value.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) { |
|
815 | 815 | filteredData.push({ |
|
816 | 816 | 'id': this.id, |
|
817 | 817 | 'text': this.text, |
|
818 | 818 | "ops": this.ops, |
|
819 | 819 | }) |
|
820 | 820 | } |
|
821 | 821 | |
|
822 | 822 | }); |
|
823 | 823 | |
|
824 | 824 | data.results = filteredData; |
|
825 | 825 | |
|
826 | 826 | query.callback(data); |
|
827 | 827 | }; |
|
828 | 828 | |
|
829 | 829 | var formatFileResult = function(result, container, query, escapeMarkup) { |
|
830 | 830 | return function(data, escapeMarkup) { |
|
831 | 831 | var container = '<div class="filelist" style="padding-right:100px">{0}</div>'; |
|
832 | 832 | var tmpl = '<span style="margin-right:-50px"><strong>{0}</strong></span>'.format(escapeMarkup(data['text'])); |
|
833 | 833 | var pill = '<span class="pill-group" style="float: right;margin-right: -100px">' + |
|
834 | 834 | '<span class="pill" op="added">{0}</span>' + |
|
835 | 835 | '<span class="pill" op="deleted">{1}</span>' + |
|
836 | 836 | '</span>' |
|
837 | 837 | ; |
|
838 | 838 | var added = data['ops']['added']; |
|
839 | 839 | if (added === 0) { |
|
840 | 840 | // don't show +0 |
|
841 | 841 | added = 0; |
|
842 | 842 | } else { |
|
843 | 843 | added = '+' + added; |
|
844 | 844 | } |
|
845 | 845 | |
|
846 | 846 | var deleted = -1*data['ops']['deleted']; |
|
847 | 847 | |
|
848 | 848 | tmpl += pill.format(added, deleted); |
|
849 | 849 | return container.format(tmpl); |
|
850 | 850 | |
|
851 | 851 | }(result, escapeMarkup); |
|
852 | 852 | }; |
|
853 | 853 | |
|
854 | 854 | var preloadFileFilterData = { |
|
855 | 855 | results: [ |
|
856 | 856 | % for filediff in diffset.files: |
|
857 | 857 | {id:"a_${h.FID(filediff.raw_id, filediff.patch['filename'])}", |
|
858 | 858 | text:"${filediff.patch['filename']}", |
|
859 | 859 | ops:${h.json.dumps(filediff.patch['stats'])|n}}${('' if loop.last else ',')} |
|
860 | 860 | % endfor |
|
861 | 861 | ] |
|
862 | 862 | }; |
|
863 | 863 | |
|
864 | 864 | $(document).ready(function () { |
|
865 | 865 | |
|
866 | 866 | var fileFilter = $("#file_filter").select2({ |
|
867 | 867 | 'dropdownAutoWidth': true, |
|
868 | 868 | 'width': 'auto', |
|
869 | 869 | 'placeholder': "${file_placeholder}", |
|
870 | 870 | containerCssClass: "drop-menu", |
|
871 | 871 | dropdownCssClass: "drop-menu-dropdown", |
|
872 | 872 | data: preloadFileFilterData, |
|
873 | 873 | query: function(query) { |
|
874 | 874 | feedFilesOptions(query, preloadFileFilterData); |
|
875 | 875 | }, |
|
876 | 876 | formatResult: formatFileResult |
|
877 | 877 | }); |
|
878 | 878 | |
|
879 | 879 | % if range_diff_on is True: |
|
880 | 880 | fileFilter.select2("enable", false); |
|
881 | 881 | % endif |
|
882 | 882 | |
|
883 | 883 | $("#file_filter").on('click', function (e) { |
|
884 | 884 | e.preventDefault(); |
|
885 | 885 | var selected = $('#file_filter').select2('data'); |
|
886 | 886 | var idSelector = "#"+selected.id; |
|
887 | 887 | window.location.hash = idSelector; |
|
888 | 888 | // expand the container if we quick-select the field |
|
889 | 889 | $(idSelector).next().prop('checked', false); |
|
890 | 890 | updateSticky() |
|
891 | 891 | }); |
|
892 | 892 | |
|
893 | 893 | var contextPrefix = _gettext('Context file: '); |
|
894 | 894 | ## sticky sidebar |
|
895 | 895 | var sidebarElement = document.getElementById('diff-file-sticky'); |
|
896 | 896 | sidebar = new StickySidebar(sidebarElement, { |
|
897 | 897 | topSpacing: 0, |
|
898 | 898 | bottomSpacing: 0, |
|
899 | 899 | innerWrapperSelector: '.sidebar__inner' |
|
900 | 900 | }); |
|
901 | 901 | sidebarElement.addEventListener('affixed.static.stickySidebar', function () { |
|
902 | 902 | // reset our file so it's not holding new value |
|
903 | 903 | $('.fpath-placeholder-text').html(contextPrefix) |
|
904 | 904 | }); |
|
905 | 905 | |
|
906 | 906 | updateSticky = function () { |
|
907 | 907 | sidebar.updateSticky(); |
|
908 | 908 | Waypoint.refreshAll(); |
|
909 | 909 | }; |
|
910 | 910 | |
|
911 | 911 | var animateText = $.debounce(100, function(fPath, anchorId) { |
|
912 | fPath = Select2.util.escapeMarkup(fPath); | |
|
913 | ||
|
912 | 914 | // animate setting the text |
|
913 | 915 | var callback = function () { |
|
914 | 916 | $('.fpath-placeholder-text').animate({'opacity': 1.00}, 200) |
|
915 | 917 | $('.fpath-placeholder-text').html(contextPrefix + '<a href="#a_' + anchorId + '">' + fPath + '</a>') |
|
916 | 918 | }; |
|
917 | 919 | $('.fpath-placeholder-text').animate({'opacity': 0.15}, 200, callback); |
|
918 | 920 | }); |
|
919 | 921 | |
|
920 | 922 | ## dynamic file waypoints |
|
921 | 923 | var setFPathInfo = function(fPath, anchorId){ |
|
922 | 924 | animateText(fPath, anchorId) |
|
923 | 925 | }; |
|
924 | 926 | |
|
925 | 927 | var codeBlock = $('.filediff'); |
|
926 | 928 | // forward waypoint |
|
927 | 929 | codeBlock.waypoint( |
|
928 | 930 | function(direction) { |
|
929 | 931 | if (direction === "down"){ |
|
930 | 932 | setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId')) |
|
931 | 933 | } |
|
932 | 934 | }, { |
|
933 | 935 | offset: 70, |
|
934 | 936 | context: '.fpath-placeholder' |
|
935 | 937 | } |
|
936 | 938 | ); |
|
937 | 939 | |
|
938 | 940 | // backward waypoint |
|
939 | 941 | codeBlock.waypoint( |
|
940 | 942 | function(direction) { |
|
941 | 943 | if (direction === "up"){ |
|
942 | 944 | setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId')) |
|
943 | 945 | } |
|
944 | 946 | }, { |
|
945 | 947 | offset: function () { |
|
946 | 948 | return -this.element.clientHeight + 90 |
|
947 | 949 | }, |
|
948 | 950 | context: '.fpath-placeholder' |
|
949 | 951 | } |
|
950 | 952 | ); |
|
951 | 953 | |
|
952 | 954 | var preloadDiffMenuData = { |
|
953 | 955 | results: [ |
|
954 | 956 | ## Wide diff mode |
|
955 | 957 | { |
|
956 | 958 | id: 1, |
|
957 | 959 | text: _gettext('Toggle Wide Mode diff'), |
|
958 | 960 | action: function () { |
|
959 | 961 | updateSticky(); |
|
960 | 962 | Rhodecode.comments.toggleWideMode(this); |
|
961 | 963 | return null; |
|
962 | 964 | }, |
|
963 | 965 | url: null, |
|
964 | 966 | }, |
|
965 | 967 | |
|
966 | 968 | ## Whitespace change |
|
967 | 969 | % if request.GET.get('ignorews', '') == '1': |
|
968 | 970 | { |
|
969 | 971 | id: 2, |
|
970 | 972 | text: _gettext('Show whitespace changes'), |
|
971 | 973 | action: function () {}, |
|
972 | 974 | url: "${h.current_route_path(request, ignorews=0)|n}" |
|
973 | 975 | }, |
|
974 | 976 | % else: |
|
975 | 977 | { |
|
976 | 978 | id: 2, |
|
977 | 979 | text: _gettext('Hide whitespace changes'), |
|
978 | 980 | action: function () {}, |
|
979 | 981 | url: "${h.current_route_path(request, ignorews=1)|n}" |
|
980 | 982 | }, |
|
981 | 983 | % endif |
|
982 | 984 | |
|
983 | 985 | ## FULL CONTEXT |
|
984 | 986 | % if request.GET.get('fullcontext', '') == '1': |
|
985 | 987 | { |
|
986 | 988 | id: 3, |
|
987 | 989 | text: _gettext('Hide full context diff'), |
|
988 | 990 | action: function () {}, |
|
989 | 991 | url: "${h.current_route_path(request, fullcontext=0)|n}" |
|
990 | 992 | }, |
|
991 | 993 | % else: |
|
992 | 994 | { |
|
993 | 995 | id: 3, |
|
994 | 996 | text: _gettext('Show full context diff'), |
|
995 | 997 | action: function () {}, |
|
996 | 998 | url: "${h.current_route_path(request, fullcontext=1)|n}" |
|
997 | 999 | }, |
|
998 | 1000 | % endif |
|
999 | 1001 | |
|
1000 | 1002 | ] |
|
1001 | 1003 | }; |
|
1002 | 1004 | |
|
1003 | 1005 | $("#diff_menu").select2({ |
|
1004 | 1006 | minimumResultsForSearch: -1, |
|
1005 | 1007 | containerCssClass: "drop-menu", |
|
1006 | 1008 | dropdownCssClass: "drop-menu-dropdown", |
|
1007 | 1009 | dropdownAutoWidth: true, |
|
1008 | 1010 | data: preloadDiffMenuData, |
|
1009 | 1011 | placeholder: "${_('Diff Options')}", |
|
1010 | 1012 | }); |
|
1011 | 1013 | $("#diff_menu").on('select2-selecting', function (e) { |
|
1012 | 1014 | e.choice.action(); |
|
1013 | 1015 | if (e.choice.url !== null) { |
|
1014 | 1016 | window.location = e.choice.url |
|
1015 | 1017 | } |
|
1016 | 1018 | }); |
|
1017 | 1019 | |
|
1018 | 1020 | }); |
|
1019 | 1021 | |
|
1020 | 1022 | </script> |
|
1021 | 1023 | % endif |
|
1022 | 1024 | |
|
1023 | 1025 | </%def> |
General Comments 0
You need to be logged in to leave comments.
Login now