feat(mercurial): added close branch commit message template

This commit is contained in:
RhodeCode Admin 2024-03-03 08:40:40 +01:00
parent 104352ccda
commit f928ad9b22
2 changed files with 10 additions and 1 deletions

View file

@ -35,6 +35,7 @@ from rhodecode.lib.datelib import (
from rhodecode.lib.str_utils import safe_str
from rhodecode.lib.utils2 import CachedProperty
from rhodecode.lib.vcs import connection, exceptions
from rhodecode.lib.vcs.conf import settings as vcs_settings
from rhodecode.lib.vcs.backends.base import (
BaseRepository, CollectionGenerator, Config, MergeResponse,
MergeFailureReason, Reference, BasePathPermissionChecker)
@ -722,7 +723,12 @@ class MercurialRepository(BaseRepository):
commit needs to be pushed.
"""
self._update(source_ref.commit_id)
message = close_message or f"Closing branch: `{source_ref.name}`"
message = (close_message or vcs_settings.HG_CLOSE_BRANCH_MESSAGE_TMPL).format(
user_name=user_name,
user_email=user_email,
target_ref_name=target_ref.name,
source_ref_name=source_ref.name
)
try:
self._remote.commit(
message=safe_str(message),

View file

@ -58,6 +58,9 @@ MERGE_MESSAGE_TMPL = (
MERGE_DRY_RUN_MESSAGE = 'dry_run_merge_message_from_rhodecode'
MERGE_DRY_RUN_USER = 'Dry-Run User'
MERGE_DRY_RUN_EMAIL = 'dry-run-merge@rhodecode.com'
HG_CLOSE_BRANCH_MESSAGE_TMPL = (
'Closing branch: `{source_ref_name}`'
)
def available_aliases():