engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merges: fixed excessive data saved in merge metadata that could not fit inside the DB table.

Browse source 
- fixes #5651
This commit is contained in:
Milka Kuzminski 2021-01-18 22:17:00 +01:00
parent 6dbf7d6dae
commit b0a5210748
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rhodecode/lib/vcs/backends/hg/repository.py
View file

@ -765,7 +765,14 @@ class MercurialRepository(BaseRepository):
try:
if target_ref.type == 'branch' and len(self._heads(target_ref.name)) != 1:
heads = '\n,'.join(self._heads(target_ref.name))
heads_all = self._heads(target_ref.name)
max_heads = 10
if len(heads_all) > max_heads:
heads = '\n,'.join(
heads_all[:max_heads] +
['and {} more.'.format(len(heads_all)-max_heads)])
else:
heads = '\n,'.join(heads_all)
metadata = {
'target_ref': target_ref,
'source_ref': source_ref,
@ -854,7 +861,16 @@ class MercurialRepository(BaseRepository):
except RepositoryError as e:
log.exception('Failure when doing local merge on hg shadow repo')
if isinstance(e, UnresolvedFilesInRepo):
metadata['unresolved_files'] = '\n* conflict: ' + ('\n * conflict: '.join(e.args[0]))
all_conflicts = list(e.args[0])
max_conflicts = 20
if len(all_conflicts) > max_conflicts:
conflicts = all_conflicts[:max_conflicts] \
+ ['and {} more.'.format(len(all_conflicts)-max_conflicts)]
else:
conflicts = all_conflicts
metadata['unresolved_files'] = \
'\n* conflict: ' + \
('\n * conflict: '.join(conflicts))
merge_possible = False
merge_failure_reason = MergeFailureReason.MERGE_FAILED