# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-10-23 12:34:15
# Node ID 1f1d5ef7bee3dd47757dc83c64e0bead13f90715
# Parent  57a326c40f810883da71a442022b1dccf701eb49

pr-shadow: Set bookmark in hg repositories on successful merge. #1055

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
@@ -701,6 +701,11 @@ class MercurialRepository(BaseRepository
                 target_ref, merge_message, merger_name, merger_email,
                 source_ref, use_rebase=use_rebase)
             merge_possible = True
+
+            # Set a bookmark pointing to the merge commit. This bookmark may be
+            # used to easily identify the last successful merge commit in the
+            # shadow repository.
+            shadow_repo.bookmark('pr-merge', revision=merge_commit_id)
         except RepositoryError as e:
             log.exception('Failure when doing local merge on hg shadow repo')
             merge_possible = False
@@ -737,9 +742,6 @@ class MercurialRepository(BaseRepository
         else:
             merge_succeeded = False
 
-        if dry_run:
-            merge_commit_id = None
-
         return MergeResponse(
             merge_possible, merge_succeeded, merge_commit_id,
             merge_failure_reason)