diff --git a/service/shale/webhook.sh b/service/shale/webhook.sh index 009a326faa016a4c73bc7b1c767677f10262660c..3868180f235279127a60c6ba73ff5dde0a4bcff1 100755 --- a/service/shale/webhook.sh +++ b/service/shale/webhook.sh @@ -106,11 +106,11 @@ while read -r before after ref; do if is_zero "$before"; then created=true forced=false - commits=$(git rev-list --reverse "$after") + commits=$(git rev-list -n 20 --reverse "$after" --not --exclude="$short_ref" --branches --tags) else created=false if git merge-base --is-ancestor "$before" "$after"; then forced=false; else forced=true; fi - commits=$(git rev-list --reverse "$before..$after") + commits=$(git rev-list -n 20 --reverse "$before..$after") fi compare="$origin/commit/$after" { diff --git a/tools/shale-webhook-test.py b/tools/shale-webhook-test.py index 3a314632c5f70e710f32105c7e79ffb90095ae47..0c8288d7275fc39c79d513576233a1f6b6e6d299 100644 --- a/tools/shale-webhook-test.py +++ b/tools/shale-webhook-test.py @@ -102,6 +102,26 @@ class ShaleWebhookTests(unittest.TestCase): event, _, payload = Receiver.events.pop(0) self.assertEqual((event, payload["ref_type"], payload["ref"]), ("delete", "branch", "delete-me")) + def test_payload_lists_only_new_commits_capped_at_twenty(self): + work = self.repositories() + for i in range(24): + self.git("commit", "--allow-empty", "-m", f"c{i}", cwd=work) + env = { + **os.environ, + "DOMAIN": "shale.test", + "SHALE_WEBHOOK_ENABLED": "true", + "SHALE_WEBHOOK_URL": f"http://127.0.0.1:{self.server.server_port}/hook", + } + self.git("push", "origin", "main", cwd=work, env=env) + _, _, payload = Receiver.events.pop(0) + self.assertEqual([c["message"] for c in payload["commits"]][-1], "c23") + self.assertEqual(len(payload["commits"]), 20) + + self.git("push", "origin", "main:topic", cwd=work, env=env) + _, _, payload = Receiver.events.pop(0) + self.assertEqual(payload["commits"], []) + self.assertEqual(payload["head_commit"]["id"], payload["after"]) + def test_prepare_installs_only_named_repository_hooks(self): owned = self.root / "repositories_owned" database = self.root / "data/astheno.shale.db"