Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 05:55:44 +01:00
Code Issues Packages Projects Releases Activity

Fix sub repositories in mercurial

Browse Source 
The sub repositories did not show up in the source view.
This fixes python errors for the computation of sub
repositories in hg.

Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
This commit is contained in:
Rene Pfeuffer
2024-06-19 17:46:42 +02:00
parent d74fd099cc
commit b98cdeb28d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/sub_repos.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: fixed
description: Sub repositories in the source view for mercurial repositories

7
scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/fileview.py
View File

@@ -29,6 +29,7 @@ Prints date, size and last message of files.
from collections import defaultdict from collections import defaultdict
from mercurial import scmutil from mercurial import scmutil
from builtins import open, bytes
cmdtable = {} cmdtable = {}
@@ -177,7 +178,7 @@ class SubRepository:
def collect_sub_repositories(revCtx): def collect_sub_repositories(revCtx):
subrepos = {} subrepos = {}
try: try:
hgsub = revCtx.filectx(b'.hgsub').data().split('\n') hgsub = revCtx.filectx(b'.hgsub').data().split(b'\n')
for line in hgsub: for line in hgsub:
parts = line.split(b'=') parts = line.split(b'=')
if len(parts) > 1: if len(parts) > 1:
@@ -188,9 +189,9 @@ def collect_sub_repositories(revCtx):
pass pass
try: try:
hgsubstate = revCtx.filectx(b'.hgsubstate').data().split('\n') hgsubstate = revCtx.filectx(b'.hgsubstate').data().split(b'\n')
for line in hgsubstate: for line in hgsubstate:
parts = line.split(' ') parts = line.split(b' ')
if len(parts) > 1: if len(parts) > 1:
subrev = parts[0].strip() subrev = parts[0].strip()
subrepo = subrepos[parts[1].strip()] subrepo = subrepos[parts[1].strip()]