Skip to content

Commit

Permalink
fix: update keyword from backports to backport
Browse files Browse the repository at this point in the history
Fixes #817
  • Loading branch information
Madhu-1 authored and mergify[bot] committed Mar 19, 2020
1 parent 9f47c7c commit c598750
Show file tree
Hide file tree
Showing 164 changed files with 97,058 additions and 209,090 deletions.
2 changes: 1 addition & 1 deletion mergify_engine/doc.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR
- `@Mergifyio backports <destination>` will backport this PR on `<destination>` branch
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.io/) you can:
Expand Down
2 changes: 1 addition & 1 deletion zfixtures/cassettes/test_assign/git-1.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"args": ["init"], "kwargs": {}, "out": "Initialized empty Git repository in /tmp/mergify-gitterqg4hw213/.git/\n"}, {"args": ["config", "user.name", "mergify-bot"], "kwargs": {}, "out": ""}, {"args": ["config", "user.email", "[email protected]"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.useHttpPath", "true"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.helper", "cache --timeout=300 --socket=/tmp/mergify-gitter<random>/.git/creds/socket"], "kwargs": {}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergifyio-testing/repo-8672d652-ff39-4abc-8275-af9cc59a753b-test_assign\n\n"}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergify-test2/repo-8672d652-ff39-4abc-8275-af9cc59a753b-test_assign\n\n"}, "out": ""}, {"args": ["config", "user.name", "mergify-tester"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "main", "https://github.com/mergifyio-testing/repo-8672d652-ff39-4abc-8275-af9cc59a753b-test_assign"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "fork", "https://github.com/mergify-test2/repo-8672d652-ff39-4abc-8275-af9cc59a753b-test_assign"], "kwargs": {}, "out": ""}, {"args": ["add", ".mergify.yml"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "initial commit"], "kwargs": {}, "out": "[master (root-commit) 9de7211] initial commit\n 1 file changed, 8 insertions(+)\n create mode 100644 .mergify.yml\n"}, {"args": ["push", "--quiet", "main", "master"], "kwargs": {}, "out": ""}, {"args": ["fetch", "--quiet", "fork"], "kwargs": {}, "out": ""}, {"args": ["checkout", "--quiet", "fork/master", "-b", "fork/pr1"], "kwargs": {}, "out": ""}, {"args": ["add", "test1"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "Pull request n1 from fork"], "kwargs": {}, "out": "[fork/pr1 4962122] Pull request n1 from fork\n 1 file changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 test1\n"}, {"args": ["push", "--quiet", "fork", "fork/pr1"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for 'fork/pr1' on GitHub by visiting: \nremote: https://github.com/mergify-test2/repo-8672d652-ff39-4abc-8275-af9cc59a753b-test_assign/pull/new/fork/pr1 \nremote: \n"}, {"args": ["credential-cache", "--socket=/tmp/mergify-gitter<random>/.git/creds/socket", "exit"], "kwargs": {}, "out": ""}]
[{"args": ["init"], "kwargs": {}, "out": "Initialized empty Git repository in /private/var/folders/sv/_9vpkb_93x37dh48kb6z8qf80000gn/T/mergify-gitterxnp8_m__/.git/\n"}, {"args": ["config", "user.name", "mergify-bot"], "kwargs": {}, "out": ""}, {"args": ["config", "user.email", "[email protected]"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.useHttpPath", "true"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.helper", "cache --timeout=300 --socket=/tmp/mergify-gitter<random>/.git/creds/socket"], "kwargs": {}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergifyio-testing/repo-9f7babfb-2bb5-4762-86d0-a25e4e296576-test_assign\n\n"}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergify-test2/repo-9f7babfb-2bb5-4762-86d0-a25e4e296576-test_assign\n\n"}, "out": ""}, {"args": ["config", "user.name", "mergify-tester"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "main", "https://github.com/mergifyio-testing/repo-9f7babfb-2bb5-4762-86d0-a25e4e296576-test_assign"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "fork", "https://github.com/mergify-test2/repo-9f7babfb-2bb5-4762-86d0-a25e4e296576-test_assign"], "kwargs": {}, "out": ""}, {"args": ["add", ".mergify.yml"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "initial commit"], "kwargs": {}, "out": "[master (root-commit) 11c9ed1] initial commit\n 1 file changed, 8 insertions(+)\n create mode 100644 .mergify.yml\n"}, {"args": ["push", "--quiet", "main", "master"], "kwargs": {}, "out": ""}, {"args": ["fetch", "--quiet", "fork"], "kwargs": {}, "out": ""}, {"args": ["checkout", "--quiet", "fork/master", "-b", "fork/pr1"], "kwargs": {}, "out": ""}, {"args": ["add", "test1"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "Pull request n1 from fork"], "kwargs": {}, "out": "[fork/pr1 ba53f8f] Pull request n1 from fork\n 1 file changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 test1\n"}, {"args": ["push", "--quiet", "fork", "fork/pr1"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for 'fork/pr1' on GitHub by visiting: \nremote: https://github.com/mergify-test2/repo-9f7babfb-2bb5-4762-86d0-a25e4e296576-test_assign/pull/new/fork/pr1 \nremote: \n"}, {"args": ["credential-cache", "--socket=/tmp/mergify-gitter<random>/.git/creds/socket", "exit"], "kwargs": {}, "out": ""}]
2,917 changes: 1,138 additions & 1,779 deletions zfixtures/cassettes/test_assign/http.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion zfixtures/cassettes/test_assign/reponame
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8672d652-ff39-4abc-8275-af9cc59a753b
9f7babfb-2bb5-4762-86d0-a25e4e296576
2 changes: 1 addition & 1 deletion zfixtures/cassettes/test_backport_cancelled/git-1.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"args": ["init"], "kwargs": {}, "out": "Initialized empty Git repository in /tmp/mergify-gitterwij032ih/.git/\n"}, {"args": ["config", "user.name", "mergify-bot"], "kwargs": {}, "out": ""}, {"args": ["config", "user.email", "[email protected]"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.useHttpPath", "true"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.helper", "cache --timeout=300 --socket=/tmp/mergify-gitter<random>/.git/creds/socket"], "kwargs": {}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergifyio-testing/repo-b87b8c66-31f0-43df-8d45-c9a6d580f76f-test_backport_cancelled\n\n"}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergify-test2/repo-b87b8c66-31f0-43df-8d45-c9a6d580f76f-test_backport_cancelled\n\n"}, "out": ""}, {"args": ["config", "user.name", "mergify-tester"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "main", "https://github.com/mergifyio-testing/repo-b87b8c66-31f0-43df-8d45-c9a6d580f76f-test_backport_cancelled"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "fork", "https://github.com/mergify-test2/repo-b87b8c66-31f0-43df-8d45-c9a6d580f76f-test_backport_cancelled"], "kwargs": {}, "out": ""}, {"args": ["add", ".mergify.yml"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "initial commit"], "kwargs": {}, "out": "[master (root-commit) cb3683e] initial commit\n 1 file changed, 9 insertions(+)\n create mode 100644 .mergify.yml\n"}, {"args": ["branch", "stable/3.1", "master"], "kwargs": {}, "out": ""}, {"args": ["push", "--quiet", "main", "master", "stable/3.1"], "kwargs": {}, "out": ""}, {"args": ["fetch", "--quiet", "fork"], "kwargs": {}, "out": ""}, {"args": ["checkout", "--quiet", "fork/master", "-b", "fork/pr1"], "kwargs": {}, "out": ""}, {"args": ["add", "test1"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "Pull request n1 from fork"], "kwargs": {}, "out": "[fork/pr1 c9cc8af] Pull request n1 from fork\n 1 file changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 test1\n"}, {"args": ["push", "--quiet", "fork", "fork/pr1"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for 'fork/pr1' on GitHub by visiting: \nremote: https://github.com/mergify-test2/repo-b87b8c66-31f0-43df-8d45-c9a6d580f76f-test_backport_cancelled/pull/new/fork/pr1 \nremote: \n"}, {"args": ["credential-cache", "--socket=/tmp/mergify-gitter<random>/.git/creds/socket", "exit"], "kwargs": {}, "out": ""}]
[{"args": ["init"], "kwargs": {}, "out": "Initialized empty Git repository in /private/var/folders/sv/_9vpkb_93x37dh48kb6z8qf80000gn/T/mergify-gitter4k5brv4d/.git/\n"}, {"args": ["config", "user.name", "mergify-bot"], "kwargs": {}, "out": ""}, {"args": ["config", "user.email", "[email protected]"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.useHttpPath", "true"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.helper", "cache --timeout=300 --socket=/tmp/mergify-gitter<random>/.git/creds/socket"], "kwargs": {}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergifyio-testing/repo-eb7ae450-403f-4111-a0d9-c0b5a66b7ece-test_backport_cancelled\n\n"}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergify-test2/repo-eb7ae450-403f-4111-a0d9-c0b5a66b7ece-test_backport_cancelled\n\n"}, "out": ""}, {"args": ["config", "user.name", "mergify-tester"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "main", "https://github.com/mergifyio-testing/repo-eb7ae450-403f-4111-a0d9-c0b5a66b7ece-test_backport_cancelled"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "fork", "https://github.com/mergify-test2/repo-eb7ae450-403f-4111-a0d9-c0b5a66b7ece-test_backport_cancelled"], "kwargs": {}, "out": ""}, {"args": ["add", ".mergify.yml"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "initial commit"], "kwargs": {}, "out": "[master (root-commit) ff85549] initial commit\n 1 file changed, 9 insertions(+)\n create mode 100644 .mergify.yml\n"}, {"args": ["branch", "stable/3.1", "master"], "kwargs": {}, "out": ""}, {"args": ["push", "--quiet", "main", "master", "stable/3.1"], "kwargs": {}, "out": ""}, {"args": ["fetch", "--quiet", "fork"], "kwargs": {}, "out": ""}, {"args": ["checkout", "--quiet", "fork/master", "-b", "fork/pr1"], "kwargs": {}, "out": ""}, {"args": ["add", "test1"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "Pull request n1 from fork"], "kwargs": {}, "out": "[fork/pr1 c3116c9] Pull request n1 from fork\n 1 file changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 test1\n"}, {"args": ["push", "--quiet", "fork", "fork/pr1"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for 'fork/pr1' on GitHub by visiting: \nremote: https://github.com/mergify-test2/repo-eb7ae450-403f-4111-a0d9-c0b5a66b7ece-test_backport_cancelled/pull/new/fork/pr1 \nremote: \n"}, {"args": ["credential-cache", "--socket=/tmp/mergify-gitter<random>/.git/creds/socket", "exit"], "kwargs": {}, "out": ""}]
Loading

0 comments on commit c598750

Please sign in to comment.