##// END OF EJS Templates
commits: detect missing commits on diffsets from new PR ancestor logic....
marcink -
r4400:96b3ab25 stable
parent child Browse files
Show More
@@ -568,6 +568,7 b' class RepoPullRequestsView(RepoAppView, '
568 c.commit_ranges.append(comm)
568 c.commit_ranges.append(comm)
569
569
570 c.missing_requirements = missing_requirements
570 c.missing_requirements = missing_requirements
571
571 c.ancestor_commit = ancestor_commit
572 c.ancestor_commit = ancestor_commit
572 c.statuses = source_repo.statuses(
573 c.statuses = source_repo.statuses(
573 [x.raw_id for x in c.commit_ranges])
574 [x.raw_id for x in c.commit_ranges])
@@ -596,6 +597,7 b' class RepoPullRequestsView(RepoAppView, '
596 if not force_recache and has_proper_diff_cache:
597 if not force_recache and has_proper_diff_cache:
597 c.diffset = cached_diff['diff']
598 c.diffset = cached_diff['diff']
598 else:
599 else:
600 try:
599 c.diffset = self._get_diffset(
601 c.diffset = self._get_diffset(
600 c.source_repo.repo_name, commits_source_repo,
602 c.source_repo.repo_name, commits_source_repo,
601 c.ancestor_commit,
603 c.ancestor_commit,
@@ -603,10 +605,14 b' class RepoPullRequestsView(RepoAppView, '
603 target_commit, source_commit,
605 target_commit, source_commit,
604 diff_limit, file_limit, c.fulldiff,
606 diff_limit, file_limit, c.fulldiff,
605 hide_whitespace_changes, diff_context)
607 hide_whitespace_changes, diff_context)
606
607 # save cached diff
608 # save cached diff
608 if caching_enabled:
609 if caching_enabled:
609 cache_diff(cache_file_path, c.diffset, diff_commit_cache)
610 cache_diff(cache_file_path, c.diffset, diff_commit_cache)
611 except CommitDoesNotExistError:
612 log.exception('Failed to generate diffset')
613 c.missing_commits = True
614
615 if not c.missing_commits:
610
616
611 c.limited_diff = c.diffset.limited_diff
617 c.limited_diff = c.diffset.limited_diff
612
618
@@ -465,9 +465,9 b''
465 <div class="alert alert-warning">
465 <div class="alert alert-warning">
466 <div>
466 <div>
467 <strong>${_('Missing commits')}:</strong>
467 <strong>${_('Missing commits')}:</strong>
468 ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
468 ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}<br/>
469 ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
469 ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}<br/>
470 ${_('Consider doing a {force_refresh_url} in case you think this is an error.').format(force_refresh_url=h.link_to('force refresh', h.current_route_path(request, force_refresh='1')))|n}
470 ${_('Consider doing a `force update commits` in case you think this is an error.')}
471 </div>
471 </div>
472 </div>
472 </div>
473 </div>
473 </div>
General Comments 0
You need to be logged in to leave comments. Login now