Show More
@@ -820,7 +820,6 b' input.filediff-collapse-state {' | |||
|
820 | 820 | .pill { |
|
821 | 821 | &[op="name"] { |
|
822 | 822 | background: none; |
|
823 | color: @grey2; | |
|
824 | 823 | opacity: 1; |
|
825 | 824 | color: white; |
|
826 | 825 | } |
@@ -840,6 +839,10 b' input.filediff-collapse-state {' | |||
|
840 | 839 | background: @color4; |
|
841 | 840 | color: white; |
|
842 | 841 | } |
|
842 | &[op="copied"] { | |
|
843 | background: @color4; | |
|
844 | color: white; | |
|
845 | } | |
|
843 | 846 | &[op="mode"] { |
|
844 | 847 | background: @grey3; |
|
845 | 848 | color: white; |
@@ -324,13 +324,17 b' collapse_all = len(diffset.files) > coll' | |||
|
324 | 324 | <% |
|
325 | 325 | stats = filediff['patch']['stats'] |
|
326 | 326 | from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \ |
|
327 | MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE | |
|
327 | MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE | |
|
328 | 328 | %> |
|
329 | 329 | <span class="pill"> |
|
330 | 330 | %if filediff.source_file_path and filediff.target_file_path: |
|
331 | 331 | %if filediff.source_file_path != filediff.target_file_path: |
|
332 | ## file was renamed | |
|
333 | <strong>${filediff.target_file_path}</strong> ⬅ <del>${filediff.source_file_path}</del> | |
|
332 | ## file was renamed, or copied | |
|
333 | %if RENAMED_FILENODE in stats['ops']: | |
|
334 | <strong>${filediff.target_file_path}</strong> ⬅ <del>${filediff.source_file_path}</del> | |
|
335 | %elif COPIED_FILENODE in stats['ops']: | |
|
336 | <strong>${filediff.target_file_path}</strong> ⬅ ${filediff.source_file_path} | |
|
337 | %endif | |
|
334 | 338 | %else: |
|
335 | 339 | ## file was modified |
|
336 | 340 | <strong>${filediff.source_file_path}</strong> |
@@ -349,10 +353,15 b' from rhodecode.lib.diffs import NEW_FILE' | |||
|
349 | 353 | %if filediff.patch['is_limited_diff']: |
|
350 | 354 | <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span> |
|
351 | 355 | %endif |
|
356 | ||
|
352 | 357 |
|
|
353 | 358 | <span class="pill" op="renamed">renamed</span> |
|
354 | 359 | %endif |
|
355 | 360 | |
|
361 | %if COPIED_FILENODE in stats['ops']: | |
|
362 | <span class="pill" op="copied">copied</span> | |
|
363 | %endif | |
|
364 | ||
|
356 | 365 | %if NEW_FILENODE in stats['ops']: |
|
357 | 366 | <span class="pill" op="created">created</span> |
|
358 | 367 | %if filediff['target_mode'].startswith('120'): |
General Comments 0
You need to be logged in to leave comments.
Login now