# HG changeset patch # User Johannes Bornhold # Date 2016-06-08 21:26:40 # Node ID f220593cb0ff01bbfe88dfaa35291c6004d56920 # Parent 8725ea73e54d816fbe2dcec9f004e70cc6db93ab hg: Increase logging around merge status check diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py --- a/rhodecode/lib/vcs/backends/hg/repository.py +++ b/rhodecode/lib/vcs/backends/hg/repository.py @@ -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: