Merge lp:~jelmer/brz/fix-git-subpath into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/fix-git-subpath
Merge into: lp:brz
Diff against target: 31 lines (+11/-0)
2 files modified
breezy/git/remote.py (+3/-0)
breezy/git/tests/test_remote.py (+8/-0)
To merge this branch: bzr merge lp:~jelmer/brz/fix-git-subpath
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+371168@code.launchpad.net

Commit message

Properly interpret error message about subpath on github.

Description of the change

Properly interpret error message about subpath on github.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/git/remote.py'
2--- breezy/git/remote.py 2019-07-26 08:21:20 +0000
3+++ breezy/git/remote.py 2019-08-11 15:31:23 +0000
4@@ -211,6 +211,9 @@
5 return PermissionDenied(url, message)
6 if message.endswith(' does not appear to be a git repository'):
7 return NotBranchError(url, message)
8+ if re.match('(.+) is not a valid repository name',
9+ message.splitlines()[0]):
10+ return NotBranchError(url, message)
11 m = re.match(r'Permission to ([^ ]+) denied to ([^ ]+)\.', message)
12 if m:
13 return PermissionDenied(m.group(1), 'denied to %s' % m.group(2))
14
15=== modified file 'breezy/git/tests/test_remote.py'
16--- breezy/git/tests/test_remote.py 2019-07-15 23:40:33 +0000
17+++ breezy/git/tests/test_remote.py 2019-08-11 15:31:23 +0000
18@@ -125,6 +125,14 @@
19 self.assertEqual(e.path, 'porridge/gaduhistory.git')
20 self.assertEqual(e.extra, ': denied to jelmer')
21
22+ def test_invalid_repo_name(self):
23+ e = parse_git_error(
24+ "url",
25+ """Gregwar/fatcat/tree/debian is not a valid repository name
26+Email support@github.com for help
27+""")
28+ self.assertIsInstance(e, NotBranchError)
29+
30
31 class TestRemoteGitBranchFormat(TestCase):
32

Subscribers

People subscribed via source and target branches