##// END OF EJS Templates
hg: Increase logging around merge status check
johbo -
r142:f220593c default
parent child Browse files
Show More
@@ -645,6 +645,8 b' class MercurialRepository(BaseRepository'
645 shadow_repository_path = self._get_shadow_repository_path(workspace_id)
645 shadow_repository_path = self._get_shadow_repository_path(workspace_id)
646 if not os.path.exists(shadow_repository_path):
646 if not os.path.exists(shadow_repository_path):
647 self._local_clone(shadow_repository_path)
647 self._local_clone(shadow_repository_path)
648 log.debug(
649 'Prepared shadow repository in %s', shadow_repository_path)
648
650
649 return shadow_repository_path
651 return shadow_repository_path
650
652
@@ -667,9 +669,11 b' class MercurialRepository(BaseRepository'
667
669
668 shadow_repo = self._get_shadow_instance(shadow_repository_path)
670 shadow_repo = self._get_shadow_instance(shadow_repository_path)
669
671
672 log.debug('Pulling in target reference %s', target_ref)
670 self._validate_pull_reference(target_ref)
673 self._validate_pull_reference(target_ref)
671 shadow_repo._local_pull(self.path, target_ref)
674 shadow_repo._local_pull(self.path, target_ref)
672 try:
675 try:
676 log.debug('Pulling in source reference %s', source_ref)
673 source_repo._validate_pull_reference(source_ref)
677 source_repo._validate_pull_reference(source_ref)
674 shadow_repo._local_pull(source_repo.path, source_ref)
678 shadow_repo._local_pull(source_repo.path, source_ref)
675 except CommitDoesNotExistError as e:
679 except CommitDoesNotExistError as e:
General Comments 0
You need to be logged in to leave comments. Login now