##// END OF EJS Templates
diffs: fixed outdated files in pull-requests re-using the filediff raw_id for anchor generation....
marcink -
r3937:cc125265 default
parent child
Show More
@@ -54,7 +54,7 class TestGetRepoChangeset(object):
54 details=details,
54 details=details,
55 )
55 )
56 response = api_call(self.app, params)
56 response = api_call(self.app, params)
57 expected = 'commit_id must be a string value'
57 expected = "commit_id must be a string value got <type 'int'> instead"
58 assert_error(id_, expected, given=response.body)
58 assert_error(id_, expected, given=response.body)
59
59
60 @pytest.mark.parametrize("details", ['basic', 'extended', 'full'])
60 @pytest.mark.parametrize("details", ['basic', 'extended', 'full'])
@@ -137,5 +137,5 class TestGetRepoChangeset(object):
137 details=details,
137 details=details,
138 )
138 )
139 response = api_call(self.app, params)
139 response = api_call(self.app, params)
140 expected = 'commit_id must be a string value'
140 expected = "commit_id must be a string value got <type 'int'> instead"
141 assert_error(id_, expected, given=response.body)
141 assert_error(id_, expected, given=response.body)
@@ -735,7 +735,7 class BaseRepository(object):
735
735
736 def _validate_commit_id(self, commit_id):
736 def _validate_commit_id(self, commit_id):
737 if not isinstance(commit_id, compat.string_types):
737 if not isinstance(commit_id, compat.string_types):
738 raise TypeError("commit_id must be a string value")
738 raise TypeError("commit_id must be a string value got {} instead".format(type(commit_id)))
739
739
740 def _validate_commit_idx(self, commit_idx):
740 def _validate_commit_idx(self, commit_idx):
741 if not isinstance(commit_idx, (int, long)):
741 if not isinstance(commit_idx, (int, long)):
@@ -367,15 +367,17 return '%s_%s_%i' % (h.md5_safe(commit+f
367
367
368 ## outdated comments that are made for a file that has been deleted
368 ## outdated comments that are made for a file that has been deleted
369 % for filename, comments_dict in (deleted_files_comments or {}).items():
369 % for filename, comments_dict in (deleted_files_comments or {}).items():
370
370 <%
371 <%
371 display_state = 'display: none'
372 display_state = 'display: none'
372 open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False]
373 open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False]
373 if open_comments_in_file:
374 if open_comments_in_file:
374 display_state = ''
375 display_state = ''
376 fid = str(id(filename))
375 %>
377 %>
376 <div class="filediffs filediff-outdated" style="${display_state}">
378 <div class="filediffs filediff-outdated" style="${display_state}">
377 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filename)}" type="checkbox" onchange="updateSticky();">
379 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filename)}" type="checkbox" onchange="updateSticky();">
378 <div class="filediff" data-f-path="${filename}" id="a_${h.FID(filediff.raw_id, filename)}">
380 <div class="filediff" data-f-path="${filename}" id="a_${h.FID(fid, filename)}">
379 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
381 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
380 <div class="filediff-collapse-indicator icon-"></div>
382 <div class="filediff-collapse-indicator icon-"></div>
381
383
@@ -387,7 +389,7 return '%s_%s_%i' % (h.md5_safe(commit+f
387 ## file op, doesn't need translation
389 ## file op, doesn't need translation
388 <span class="pill" op="removed">removed in this version</span>
390 <span class="pill" op="removed">removed in this version</span>
389 </span>
391 </span>
390 <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filename)}"></a>
392 <a class="pill filediff-anchor" href="#a_${h.FID(fid, filename)}"></a>
391 <span class="pill-group pull-right">
393 <span class="pill-group pull-right">
392 <span class="pill" op="deleted">-${comments_dict['stats']}</span>
394 <span class="pill" op="deleted">-${comments_dict['stats']}</span>
393 </span>
395 </span>
General Comments 0
You need to be logged in to leave comments. Login now