feat(delete-branch-after-merge-git): added ability to delete a branch automatically after merging PR (if it was configured). Fixes: RCCE-76

rhodecode/lib/vcs/backends/git/repository.py

@@ -1040,6 +1040,8 b' class GitRepository(BaseRepository):'
                     pr_branch, self.path, target_ref.name, enable_hooks=True,
                     rc_scm_data=self.config.get('rhodecode', 'RC_SCM_DATA'))
                 merge_succeeded = True
+                if close_branch and source_ref.name != target_ref.name and not dry_run and source_ref.type == 'branch':
+                    self.delete_branch(source_ref.name)
             except RepositoryError:
                 log.exception(
                     'Failure when doing local push from the shadow '

rhodecode/templates/base/vcs_settings.mako

@@ -300,13 +300,12 b''
         </div>
     % endif
 
-## DISABLED FOR GIT FOR NOW as the rebase/close is not supported yet
-##     % if display_globals or repo_type in ['git']:
-##         <div class="panel panel-default">
-##             <div class="panel-heading" id="vcs-pull-requests-options">
-##                 <h3 class="panel-title">${_('Git Pull Request Settings')}<a class="permalink" href="#vcs-git-pull-requests-options"> ¶</a></h3>
-##             </div>
-##             <div class="panel-body">
+% if display_globals or repo_type in ['git']:
+    <div class="panel panel-default">
+        <div class="panel-heading" id="vcs-pull-requests-options">
+            <h3 class="panel-title">${_('Git Pull Request Settings')}<a class="permalink" href="#vcs-git-pull-requests-options"> ¶</a></h3>
+        </div>
+        <div class="panel-body">
 ##                 <div class="checkbox">
 ##                     ${h.checkbox('rhodecode_git_use_rebase_for_merging' + suffix, 'True', **kwargs)}
 ##                     <label for="rhodecode_git_use_rebase_for_merging${suffix}">${_('Use rebase as merge strategy')}</label>
@@ -314,17 +313,17 b''
 ##                 <div class="label">
 ##                     <span class="help-block">${_('Use rebase instead of creating a merge commit when merging via web interface.')}</span>
 ##                 </div>
-##
-##                 <div class="checkbox">
-##                     ${h.checkbox('rhodecode_git_close_branch_before_merging' + suffix, 'True', **kwargs)}
-##                     <label for="rhodecode_git_close_branch_before_merging{suffix}">${_('Delete branch after merging it')}</label>
-##                 </div>
-##                 <div class="label">
-##                     <span class="help-block">${_('Delete branch after merging it into destination branch. No effect when rebase strategy is use.')}</span>
-##                 </div>
-##             </div>
-##         </div>
-##     % endif
+
+            <div class="checkbox">
+                ${h.checkbox('rhodecode_git_close_branch_before_merging' + suffix, 'True', **kwargs)}
+                <label for="rhodecode_git_close_branch_before_merging{suffix}">${_('Delete branch after merging it')}</label>
+            </div>
+            <div class="label">
+                <span class="help-block">${_('Delete branch after merging it into destination branch.')}</span>
+            </div>
+        </div>
+    </div>
+% endif
 
 <script type="text/javascript">