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

hg: Increase logging around merge status check

Browse source
This commit is contained in:
Johannes Bornhold 2016-06-08 23:26:40 +02:00
parent 6b65e5d1d4
commit 0410a1f483
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -645,6 +645,8 @@ class MercurialRepository(BaseRepository):
shadow_repository_path = self._get_shadow_repository_path(workspace_id)
if not os.path.exists(shadow_repository_path):
self._local_clone(shadow_repository_path)
log.debug(
'Prepared shadow repository in %s', shadow_repository_path)
return shadow_repository_path
@ -667,9 +669,11 @@ class MercurialRepository(BaseRepository):
shadow_repo = self._get_shadow_instance(shadow_repository_path)
log.debug('Pulling in target reference %s', target_ref)
self._validate_pull_reference(target_ref)
shadow_repo._local_pull(self.path, target_ref)
try:
log.debug('Pulling in source reference %s', source_ref)
source_repo._validate_pull_reference(source_ref)
shadow_repo._local_pull(source_repo.path, source_ref)
except CommitDoesNotExistError as e: