Launchpad itself

Merge lp:~cjwatson/launchpad/fix-snap-initial-name-bzr into lp:launchpad

  1. fix-snap-initial-name-bzr
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18717
Proposed branch: lp:~cjwatson/launchpad/fix-snap-initial-name-bzr
Merge into: lp:launchpad
Diff against target: 114 lines (+14/-15)
2 files modified
lib/lp/code/model/branch.py (+2/-3)
lib/lp/code/model/tests/test_branch.py (+12/-12)
To merge this branch: bzr merge lp:~cjwatson/launchpad/fix-snap-initial-name-bzr
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Launchpad code reviewers Pending
Review via email: mp+349170@code.launchpad.net

Commit message

Fix Branch.getBlob to call the hosting client with branch IDs rather than unique names.

Description of the change

During review of https://code.launchpad.net/~cjwatson/launchpad/branch-hosting-client/+merge/345704, I changed BranchHostingClient to take branch IDs rather than unique names, but I forgot to update https://code.launchpad.net/~cjwatson/launchpad/snap-initial-name-bzr/+merge/345757 to match. This fixes that up.

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py 2018-07-04 08:56:37 +0000
+++ lib/lp/code/model/branch.py 2018-07-09 09:40:24 +0000
@@ -829,7 +829,7 @@
829 if file_list is unset:829 if file_list is unset:
830 try:830 try:
831 inventory = hosting_client.getInventory(831 inventory = hosting_client.getInventory(
832 self.unique_name, dirname, rev=revision_id)832 self.id, dirname, rev=revision_id)
833 file_list = {833 file_list = {
834 entry['filename']: entry['file_id']834 entry['filename']: entry['file_id']
835 for entry in inventory['filelist']}835 for entry in inventory['filelist']}
@@ -843,8 +843,7 @@
843 if file_id is None:843 if file_id is None:
844 raise BranchFileNotFound(844 raise BranchFileNotFound(
845 self.unique_name, filename=filename, rev=revision_id)845 self.unique_name, filename=filename, rev=revision_id)
846 return hosting_client.getBlob(846 return hosting_client.getBlob(self.id, file_id, rev=revision_id)
847 self.unique_name, file_id, rev=revision_id)
848847
849 def getDiff(self, new, old=None):848 def getDiff(self, new, old=None):
850 """See `IBranch`."""849 """See `IBranch`."""
851850
=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py 2018-05-17 14:10:29 +0000
+++ lib/lp/code/model/tests/test_branch.py 2018-07-09 09:40:24 +0000
@@ -3311,10 +3311,10 @@
3311 blob = branch.getBlob('src/README.txt')3311 blob = branch.getBlob('src/README.txt')
3312 self.assertEqual('Some text', blob)3312 self.assertEqual('Some text', blob)
3313 self.assertEqual(3313 self.assertEqual(
3314 [((branch.unique_name, 'src'), {'rev': None})],3314 [((branch.id, 'src'), {'rev': None})],
3315 hosting_fixture.getInventory.calls)3315 hosting_fixture.getInventory.calls)
3316 self.assertEqual(3316 self.assertEqual(
3317 [((branch.unique_name, 'some-file-id'), {'rev': None})],3317 [((branch.id, 'some-file-id'), {'rev': None})],
3318 hosting_fixture.getBlob.calls)3318 hosting_fixture.getBlob.calls)
3319 self.assertEqual({}, getUtility(IMemcacheClient)._cache)3319 self.assertEqual({}, getUtility(IMemcacheClient)._cache)
33203320
@@ -3326,10 +3326,10 @@
3326 blob = branch.getBlob('src/README.txt')3326 blob = branch.getBlob('src/README.txt')
3327 self.assertEqual('Some text', blob)3327 self.assertEqual('Some text', blob)
3328 self.assertEqual(3328 self.assertEqual(
3329 [((branch.unique_name, 'src'), {'rev': 'scanned-id'})],3329 [((branch.id, 'src'), {'rev': 'scanned-id'})],
3330 hosting_fixture.getInventory.calls)3330 hosting_fixture.getInventory.calls)
3331 self.assertEqual(3331 self.assertEqual(
3332 [((branch.unique_name, 'some-file-id'), {'rev': 'scanned-id'})],3332 [((branch.id, 'some-file-id'), {'rev': 'scanned-id'})],
3333 hosting_fixture.getBlob.calls)3333 hosting_fixture.getBlob.calls)
3334 key = (3334 key = (
3335 'bazaar.launchpad.dev:bzr-file-list:%s:scanned-id:src' % branch.id)3335 'bazaar.launchpad.dev:bzr-file-list:%s:scanned-id:src' % branch.id)
@@ -3344,10 +3344,10 @@
3344 blob = branch.getBlob('src/README.txt', revision_id='some-rev')3344 blob = branch.getBlob('src/README.txt', revision_id='some-rev')
3345 self.assertEqual('Some text', blob)3345 self.assertEqual('Some text', blob)
3346 self.assertEqual(3346 self.assertEqual(
3347 [((branch.unique_name, 'src'), {'rev': 'some-rev'})],3347 [((branch.id, 'src'), {'rev': 'some-rev'})],
3348 hosting_fixture.getInventory.calls)3348 hosting_fixture.getInventory.calls)
3349 self.assertEqual(3349 self.assertEqual(
3350 [((branch.unique_name, 'some-file-id'), {'rev': 'some-rev'})],3350 [((branch.id, 'some-file-id'), {'rev': 'some-rev'})],
3351 hosting_fixture.getBlob.calls)3351 hosting_fixture.getBlob.calls)
3352 key = 'bazaar.launchpad.dev:bzr-file-list:%s:some-rev:src' % branch.id3352 key = 'bazaar.launchpad.dev:bzr-file-list:%s:some-rev:src' % branch.id
3353 self.assertEqual(3353 self.assertEqual(
@@ -3365,7 +3365,7 @@
3365 self.assertEqual('Some text', blob)3365 self.assertEqual('Some text', blob)
3366 self.assertEqual([], hosting_fixture.getInventory.calls)3366 self.assertEqual([], hosting_fixture.getInventory.calls)
3367 self.assertEqual(3367 self.assertEqual(
3368 [((branch.unique_name, 'some-file-id'), {'rev': 'some-rev'})],3368 [((branch.id, 'some-file-id'), {'rev': 'some-rev'})],
3369 hosting_fixture.getBlob.calls)3369 hosting_fixture.getBlob.calls)
33703370
3371 def test_disable_memcache(self):3371 def test_disable_memcache(self):
@@ -3379,7 +3379,7 @@
3379 blob = branch.getBlob('src/README.txt', revision_id='some-rev')3379 blob = branch.getBlob('src/README.txt', revision_id='some-rev')
3380 self.assertEqual('Some text', blob)3380 self.assertEqual('Some text', blob)
3381 self.assertEqual(3381 self.assertEqual(
3382 [((branch.unique_name, 'src'), {'rev': 'some-rev'})],3382 [((branch.id, 'src'), {'rev': 'some-rev'})],
3383 hosting_fixture.getInventory.calls)3383 hosting_fixture.getInventory.calls)
3384 self.assertEqual(3384 self.assertEqual(
3385 '{}', getUtility(IMemcacheClient).get(key.encode('UTF-8')))3385 '{}', getUtility(IMemcacheClient).get(key.encode('UTF-8')))
@@ -3391,10 +3391,10 @@
3391 blob = branch.getBlob('README.txt', revision_id='some-rev')3391 blob = branch.getBlob('README.txt', revision_id='some-rev')
3392 self.assertEqual('Some text', blob)3392 self.assertEqual('Some text', blob)
3393 self.assertEqual(3393 self.assertEqual(
3394 [((branch.unique_name, ''), {'rev': 'some-rev'})],3394 [((branch.id, ''), {'rev': 'some-rev'})],
3395 hosting_fixture.getInventory.calls)3395 hosting_fixture.getInventory.calls)
3396 self.assertEqual(3396 self.assertEqual(
3397 [((branch.unique_name, 'some-file-id'), {'rev': 'some-rev'})],3397 [((branch.id, 'some-file-id'), {'rev': 'some-rev'})],
3398 hosting_fixture.getBlob.calls)3398 hosting_fixture.getBlob.calls)
3399 key = 'bazaar.launchpad.dev:bzr-file-list:%s:some-rev:' % branch.id3399 key = 'bazaar.launchpad.dev:bzr-file-list:%s:some-rev:' % branch.id
3400 self.assertEqual(3400 self.assertEqual(
@@ -3408,7 +3408,7 @@
3408 BranchFileNotFound, branch.getBlob,3408 BranchFileNotFound, branch.getBlob,
3409 'src/README.txt', revision_id='some-rev')3409 'src/README.txt', revision_id='some-rev')
3410 self.assertEqual(3410 self.assertEqual(
3411 [((branch.unique_name, 'src'), {'rev': 'some-rev'})],3411 [((branch.id, 'src'), {'rev': 'some-rev'})],
3412 hosting_fixture.getInventory.calls)3412 hosting_fixture.getInventory.calls)
3413 self.assertEqual([], hosting_fixture.getBlob.calls)3413 self.assertEqual([], hosting_fixture.getBlob.calls)
3414 key = 'bazaar.launchpad.dev:bzr-file-list:%s:some-rev:src' % branch.id3414 key = 'bazaar.launchpad.dev:bzr-file-list:%s:some-rev:src' % branch.id
@@ -3425,7 +3425,7 @@
3425 BranchFileNotFound, branch.getBlob,3425 BranchFileNotFound, branch.getBlob,
3426 'src/README.txt', revision_id='some-rev')3426 'src/README.txt', revision_id='some-rev')
3427 self.assertEqual(3427 self.assertEqual(
3428 [((branch.unique_name, 'src'), {'rev': 'some-rev'})],3428 [((branch.id, 'src'), {'rev': 'some-rev'})],
3429 hosting_fixture.getInventory.calls)3429 hosting_fixture.getInventory.calls)
3430 self.assertEqual([], hosting_fixture.getBlob.calls)3430 self.assertEqual([], hosting_fixture.getBlob.calls)
3431 key = 'bazaar.launchpad.dev:bzr-file-list:%s:some-rev:src' % branch.id3431 key = 'bazaar.launchpad.dev:bzr-file-list:%s:some-rev:src' % branch.id