From 1d2c264728c014b4dc4672b0d88ad391ef39f702 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Mon, 4 Mar 2019 09:52:21 +0100
Subject: [PATCH] [FIX] runbot_merge: properly update squash flag on PR
 retarget

closes #82
---
 runbot_merge/controllers/__init__.py |  1 +
 runbot_merge/tests/test_basic.py     | 32 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/runbot_merge/controllers/__init__.py b/runbot_merge/controllers/__init__.py
index 7c815259..0c542138 100644
--- a/runbot_merge/controllers/__init__.py
+++ b/runbot_merge/controllers/__init__.py
@@ -100,6 +100,7 @@ def handle_pr(env, event):
         updates = {}
         if source_branch != branch:
             updates['target'] = branch.id
+            updates['squash'] = pr['commits'] == 1
         if event['changes'].keys() & {'title', 'body'}:
             updates['message'] = "{}\n\n{}".format(pr['title'].strip(), pr['body'].strip())
         if updates:
diff --git a/runbot_merge/tests/test_basic.py b/runbot_merge/tests/test_basic.py
index 77ccaea5..56dcdf91 100644
--- a/runbot_merge/tests/test_basic.py
+++ b/runbot_merge/tests/test_basic.py
@@ -594,6 +594,38 @@ def test_edit(env, repo):
         ('number', '=', prx.number)
     ]).target == branch_1
 
+def test_retarget_update_commits(env, repo):
+    """ Retargeting a PR should update its commits count
+    """
+    branch_1 = env['runbot_merge.branch'].create({
+        'name': '1.0',
+        'project_id': env['runbot_merge.project'].search([]).id,
+    })
+    master = env['runbot_merge.branch'].search([('name', '=', 'master')])
+
+    # master is 1 commit in advance of 1.0
+    m = repo.make_commit(None, 'initial', None, tree={'m': 'm'})
+    m2 = repo.make_commit(m, 'second', None, tree={'m': 'm2'})
+    repo.make_ref('heads/master', m2)
+    repo.make_ref('heads/1.0', m)
+
+    # the PR builds on master, but is errorneously targeted to 1.0
+    c = repo.make_commit(m2, 'first', None, tree={'m': 'm3'})
+    prx = repo.make_pr('title', 'body', target='1.0', ctid=c, user='user')
+    pr = env['runbot_merge.pull_requests'].search([
+        ('repository.name', '=', repo.name),
+        ('number', '=', prx.number)
+    ])
+    assert not pr.squash
+
+    prx.base = 'master'
+    assert pr.target == master
+    assert pr.squash
+
+    prx.base = '1.0'
+    assert pr.target == branch_1
+    assert not pr.squash
+
 @pytest.mark.skip(reason="what do?")
 def test_edit_retarget_managed(env, repo):
     """ A PR targeted to an un-managed branch is ignored but if the PR