Ines Almeida has proposed merging
~ines-almeida/launchpad:merge-button/rename-request-merge-endpoint into
launchpad:master.
Commit message:
Rename request_merge endpoint to requestMerge
This is more coherent with the existing endpoints
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/490177
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~ines-almeida/launchpad:merge-button/rename-request-merge-endpoint into
launchpad:master.
diff --git a/lib/lp/code/interfaces/branchmergeproposal.py b/lib/lp/code/interfaces/branchmergeproposal.py
index 3db350d..41d1c35 100644
--- a/lib/lp/code/interfaces/branchmergeproposal.py
+++ b/lib/lp/code/interfaces/branchmergeproposal.py
@@ -904,7 +904,7 @@ class IBranchMergeProposalEdit(Interface):
@call_with(person=REQUEST_USER)
@export_write_operation()
@operation_for_version("devel")
- def request_merge(person, commit_message=None, force=False):
+ def requestMerge(person, commit_message=None, force=False):
"""Request to merge this proposal.
This will make a request to the git hosting client to trigger a merge.
@@ -931,7 +931,7 @@ class IBranchMergeProposalEdit(Interface):
@export_write_operation()
@operation_for_version("devel")
def merge(person, commit_message=None, force=False):
- """To be deprecated in favour of `request_merge`.
+ """To be deprecated in favour of `requestMerge`.
:param person: The person requesting the merge.
:param commit_message: Allows overriding the commit message. If empty,
diff --git a/lib/lp/code/interfaces/githosting.py b/lib/lp/code/interfaces/githosting.py
index 4c008cb..d54cbb4 100644
--- a/lib/lp/code/interfaces/githosting.py
+++ b/lib/lp/code/interfaces/githosting.py
@@ -170,7 +170,7 @@ class IGitHostingClient(Interface):
:param logger: An optional logger.
"""
- def request_merge(
+ def requestMerge(
repo,
target_branch,
target_commit_sha1,
@@ -206,7 +206,7 @@ class IGitHostingClient(Interface):
source_repo=None,
logger=None,
):
- """To be deprecated in favour of request_merge
+ """To be deprecated in favour of requestMerge
:param repo: name of the target repository on the hosting service.
:param target_branch: name of target branch.
diff --git a/lib/lp/code/model/branchmergeproposal.py b/lib/lp/code/model/branchmergeproposal.py
index da5d6cf..c963eaf 100644
--- a/lib/lp/code/model/branchmergeproposal.py
+++ b/lib/lp/code/model/branchmergeproposal.py
@@ -1022,7 +1022,7 @@ class BranchMergeProposal(StormBase, BugLinkTargetMixin):
)
return GitPermissionType.CAN_PUSH in permissions[self.target_git_path]
- def request_merge(self, person, commit_message=None, force=False):
+ def requestMerge(self, person, commit_message=None, force=False):
"""See `IBranchMergeProposal`."""
if not getFeatureFlag(PROPOSAL_MERGE_ENABLED_FEATURE_FLAG):
@@ -1056,7 +1056,7 @@ class BranchMergeProposal(StormBase, BugLinkTargetMixin):
commit_message = self.commit_message
hosting_client = getUtility(IGitHostingClient)
- response = hosting_client.request_merge(
+ response = hosting_client.requestMerge(
self.target_git_repository_id,
self.target_git_ref.name,
self.target_git_commit_sha1,
@@ -1094,7 +1094,7 @@ class BranchMergeProposal(StormBase, BugLinkTargetMixin):
def merge(self, person, commit_message=None, force=False):
"""See `IBranchMergeProposal`.
TODO ines-almeida 2025-07-11: we want to remove this method in favor
- of the request_merge() one. Keeping it for now while we migrate.
+ of the requestMerge() one. Keeping it for now while we migrate.
"""
if not getFeatureFlag(PROPOSAL_MERGE_ENABLED_FEATURE_FLAG):
diff --git a/lib/lp/code/model/githosting.py b/lib/lp/code/model/githosting.py
index 9ee567e..c0dad3d 100644
--- a/lib/lp/code/model/githosting.py
+++ b/lib/lp/code/model/githosting.py
@@ -262,7 +262,7 @@ class GitHostingClient:
"Failed to get merge diff from Git repository: %s" % str(e)
)
- def request_merge(
+ def requestMerge(
self,
repo,
target_branch,
diff --git a/lib/lp/code/model/tests/test_branchmergeproposal.py b/lib/lp/code/model/tests/test_branchmergeproposal.py
index 965364c..4b1640c 100644
--- a/lib/lp/code/model/tests/test_branchmergeproposal.py
+++ b/lib/lp/code/model/tests/test_branchmergeproposal.py
@@ -4390,7 +4390,7 @@ class TestBranchMergeProposalMerge(TestCaseWithFactory):
class TestBranchMergeProposalRequestMerge(TestCaseWithFactory):
- """Test the request_merge method of BranchMergeProposal."""
+ """Test the requestMerge method of BranchMergeProposal."""
layer = DatabaseFunctionalLayer
@@ -4417,17 +4417,17 @@ class TestBranchMergeProposalRequestMerge(TestCaseWithFactory):
rule=rule, grantee=self.person, can_create=True, can_push=True
)
- def test_request_merge_feature_flag(self):
+ def test_requestMerge_feature_flag(self):
self.useFixture(
FeatureFixture({PROPOSAL_MERGE_ENABLED_FEATURE_FLAG: ""})
)
self.assertRaises(
BranchMergeProposalFeatureDisabled,
- self.proposal.request_merge,
+ self.proposal.requestMerge,
self.person,
)
- def test_request_merge_success(self):
+ def test_requestMerge_success(self):
repository = self.proposal.target_git_repository
[source_ref, target_ref] = self.factory.makeGitRefs(
paths=["refs/heads/source", "refs/heads/target"],
@@ -4446,7 +4446,7 @@ class TestBranchMergeProposalRequestMerge(TestCaseWithFactory):
proposal.next_preview_diff_job.start()
proposal.next_preview_diff_job.complete()
with person_logged_in(self.person):
- result = proposal.request_merge(self.person)
+ result = proposal.requestMerge(self.person)
self.assertEqual("Merge successfully queued", result)
def test_request_cross_repo_merge_success(self):
@@ -4457,7 +4457,7 @@ class TestBranchMergeProposalRequestMerge(TestCaseWithFactory):
self.proposal.next_preview_diff_job.start()
self.proposal.next_preview_diff_job.complete()
with person_logged_in(self.person):
- result = self.proposal.request_merge(self.person)
+ result = self.proposal.requestMerge(self.person)
self.assertEqual("Merge successfully queued", result)
def test_request_force_merge(self):
@@ -4466,13 +4466,13 @@ class TestBranchMergeProposalRequestMerge(TestCaseWithFactory):
with person_logged_in(self.person):
self.assertRaises(
BranchMergeProposalNotMergeable,
- self.proposal.request_merge,
+ self.proposal.requestMerge,
self.person,
)
- result = self.proposal.request_merge(self.person, force=True)
+ result = self.proposal.requestMerge(self.person, force=True)
self.assertEqual("Merge successfully queued", result)
- def test_request_merge_success_commit_message(self):
+ def test_requestMerge_success_commit_message(self):
self.proposal.createComment(
owner=self.reviewer,
vote=CodeReviewVote.APPROVE,
@@ -4481,7 +4481,7 @@ class TestBranchMergeProposalRequestMerge(TestCaseWithFactory):
self.proposal.next_preview_diff_job.complete()
self.proposal.commit_message = "Old commit message"
with person_logged_in(self.person):
- result = self.proposal.request_merge(
+ result = self.proposal.requestMerge(
self.person,
commit_message="New commit message",
)
@@ -4491,7 +4491,7 @@ class TestBranchMergeProposalRequestMerge(TestCaseWithFactory):
)
self.assertEqual("Old commit message", self.proposal.commit_message)
- def test_request_merge_unsuccessful_commit_message(self):
+ def test_requestMerge_unsuccessful_commit_message(self):
self.proposal.createComment(
owner=self.reviewer,
vote=CodeReviewVote.APPROVE,
@@ -4499,13 +4499,13 @@ class TestBranchMergeProposalRequestMerge(TestCaseWithFactory):
self.proposal.next_preview_diff_job.start()
self.proposal.next_preview_diff_job.complete()
self.proposal.commit_message = "Old commit message"
- self.hosting_fixture.request_merge.failure = (
+ self.hosting_fixture.requestMerge.failure = (
BranchMergeProposalMergeFailed("Merge proposal failed to merge")
)
with person_logged_in(self.person):
self.assertRaises(
BranchMergeProposalMergeFailed,
- self.proposal.request_merge,
+ self.proposal.requestMerge,
self.person,
commit_message="New commit message",
)
@@ -4514,59 +4514,59 @@ class TestBranchMergeProposalRequestMerge(TestCaseWithFactory):
)
self.assertEqual(self.proposal.commit_message, "Old commit message")
- def test_request_merge_no_permission(self):
+ def test_requestMerge_no_permission(self):
person = self.factory.makePerson()
self.assertRaises(
Unauthorized,
- self.proposal.request_merge,
+ self.proposal.requestMerge,
person,
)
- def test_request_merge_not_mergeable(self):
+ def test_requestMerge_not_mergeable(self):
self.assertRaises(
BranchMergeProposalNotMergeable,
- self.proposal.request_merge,
+ self.proposal.requestMerge,
self.person,
)
- def test_request_merge_bazaar_not_supported(self):
+ def test_requestMerge_bazaar_not_supported(self):
proposal = removeSecurityProxy(self.factory.makeBranchMergeProposal())
self.assertRaises(
NotImplementedError,
- proposal.request_merge,
+ proposal.requestMerge,
self.person,
)
- def test_request_merge_turnip_failure(self):
+ def test_requestMerge_turnip_failure(self):
self.proposal.createComment(
owner=self.reviewer,
vote=CodeReviewVote.APPROVE,
)
self.proposal.next_preview_diff_job.start()
self.proposal.next_preview_diff_job.complete()
- self.hosting_fixture.request_merge.failure = (
+ self.hosting_fixture.requestMerge.failure = (
BranchMergeProposalMergeFailed("Merge proposal failed to merge")
)
with person_logged_in(self.person):
self.assertRaises(
BranchMergeProposalMergeFailed,
- self.proposal.request_merge,
+ self.proposal.requestMerge,
self.person,
)
- def test_request_merge_already_merged(self):
+ def test_requestMerge_already_merged(self):
self.proposal.createComment(
owner=self.reviewer,
vote=CodeReviewVote.APPROVE,
)
self.proposal.next_preview_diff_job.start()
self.proposal.next_preview_diff_job.complete()
- self.hosting_fixture.request_merge.result = {
+ self.hosting_fixture.requestMerge.result = {
"queued": False,
"already_merged": True,
}
with person_logged_in(self.person):
- result = self.proposal.request_merge(self.person)
+ result = self.proposal.requestMerge(self.person)
self.assertEqual(
"Proposal already merged, waiting for rescan",
result,
diff --git a/lib/lp/code/tests/helpers.py b/lib/lp/code/tests/helpers.py
index ecda57d..45d904e 100644
--- a/lib/lp/code/tests/helpers.py
+++ b/lib/lp/code/tests/helpers.py
@@ -383,7 +383,7 @@ class GitHostingFixture(fixtures.Fixture):
self.detectMerges = fake_method_factory(
result=({} if merges is None else merges)
)
- self.request_merge = fake_method_factory(
+ self.requestMerge = fake_method_factory(
result=({"queued": True, "already_merged": False})
)
self.merge = fake_method_factory(
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
