From 1f9713cca0433c33cc2940a8ab577d82000be9cb Mon Sep 17 00:00:00 2001 From: Paul Morelle Date: Wed, 12 Feb 2020 13:48:11 +0100 Subject: [PATCH] [FIX] forwardport: update the wiki link On github wiki, the link changed from https://github.com/odoo/odoo/wiki/Mergebot to https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot Reflect these changes in the comments posted by the bot. --- forwardport/models/project.py | 2 +- forwardport/tests/test_limit.py | 4 ++-- forwardport/tests/test_simple.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/forwardport/models/project.py b/forwardport/models/project.py index 60cebab1..3801b8b9 100644 --- a/forwardport/models/project.py +++ b/forwardport/models/project.py @@ -662,7 +662,7 @@ class PullRequests(models.Model): source = pr.source_id or pr (h, out, err) = conflicts.get(pr) or (None, None, None) - footer = '\nMore info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port\n' + footer = '\nMore info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port\n' if has_conflicts and not h: footer = '\n**WARNING** at least one co-dependent PR (%s) ' \ 'did not properly forward-port, you will need to ' \ diff --git a/forwardport/tests/test_limit.py b/forwardport/tests/test_limit.py index 32f3e73e..4dfada96 100644 --- a/forwardport/tests/test_limit.py +++ b/forwardport/tests/test_limit.py @@ -205,7 +205,7 @@ This PR targets b and is the last of the forward-port chain. To merge the full chain, say > @%s r+ -More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port +More info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port """ % (users['user'], users['reviewer'], users['user'])), ] @@ -250,7 +250,7 @@ def test_limit_after_merge(env, config, make_repo, users): (users['user'], """\ This PR targets b and is part of the forward-port chain. Further PRs will be created up to c. -More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port +More info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port """), (users['reviewer'], bot_name + ' up to b'), (bot_name, "Sorry, forward-port limit can only be set on an origin PR" diff --git a/forwardport/tests/test_simple.py b/forwardport/tests/test_simple.py index 7f5bd2b5..5d1a4ce2 100644 --- a/forwardport/tests/test_simple.py +++ b/forwardport/tests/test_simple.py @@ -141,7 +141,7 @@ This PR targets c and is the last of the forward-port chain containing: To merge the full chain, say > @%s r+ -More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port +More info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port """ % ( users['other'], users['reviewer'], pr1.display_name, @@ -250,7 +250,7 @@ def test_update_pr(env, config, make_repo, users): fp_intermediate = (users['user'], '''\ This PR targets b and is part of the forward-port chain. Further PRs will be created up to c. -More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port +More info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port ''') ci_warning = (users['user'], 'Ping @%(user)s, @%(reviewer)s\n\nci/runbot failed on this forward-port PR' % users) @@ -849,7 +849,7 @@ def test_batched(env, config, make_repo, users): (users['user'], """\ This PR targets b and is part of the forward-port chain. Further PRs will be created up to c. -More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port +More info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port """), ] pr_remote_1b = main1.get_pr(pr1b.number) @@ -945,7 +945,7 @@ class TestClosing: (users['user'], """\ This PR targets b and is part of the forward-port chain. Further PRs will be created up to c. -More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port +More info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port """) ]