Skip to content

Commit 429679a

Browse files
committed
Merge branch fix/1.10.1 ; 🔖 Version bump to 1.10.1
2 parents 70732ff + 6bf06d6 commit 429679a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

git_repo/services/ext/bitbucket.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=N
238238
try:
239239
onto_project = self.get_repository(onto_user, onto_repo)
240240

241-
from_reposlug = self.guess_repo_slug(self.repository, self)
241+
from_reposlug = self.guess_repo_slug(self.repository, self, resolve_targets=['{service}'])
242242
if from_reposlug:
243243
from_user, from_repo = from_reposlug.split('/')
244244
if (onto_user, onto_repo) == (from_user, from_repo):

git_repo/services/ext/gitlab.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=N
257257
if not onto_project:
258258
raise ResourceNotFoundError('Could not find project `{}/{}`!'.format(onto_user, onto_repo))
259259

260-
from_reposlug = self.guess_repo_slug(self.repository, self)
260+
from_reposlug = self.guess_repo_slug(self.repository, self, resolve_targets=['{service}'])
261261
if from_reposlug:
262262
from_user, from_repo = from_reposlug.split('/')
263263
if (onto_user, onto_repo) == (from_user, from_repo):
@@ -287,7 +287,7 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=N
287287
if not onto_branch:
288288
onto_branch = self.get_project_default_branch(onto_project)
289289

290-
onto_target = '{}/{}:{}'.format(onto_user, onto_project.name, onto_branch)
290+
onto_target = '{}:{}'.format(onto_user, onto_project.path_with_namespace, onto_branch)
291291

292292
# translate from gitlab username to git remote name
293293
if not title and not description and edit:

0 commit comments

Comments
 (0)