/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_fetch.py

• browse files at revision 7011
• compare with another revision
• compare with revision 7498.1.1
• download diff
• download tarball
• view history from revision 7011

Show diffs side-by-side

added

removed

breezy/tests/test_fetch.py

193

193

        wt2 = self.make_branch_and_tree('br2')

194

194

        br2 = wt2.branch

195

195

        wt2.commit(message='rev 2-1', rev_id=b'2-1')

196

 

        wt2.merge_from_branch(br1, from_revision='null:')

 

196

        wt2.merge_from_branch(br1, from_revision=b'null:')

197

197

        self._check_revs_present(br2)

198

198

 

199

199

    def test_merge_fetches(self):

210

210

        self._check_revs_present(br2)

211

211

 

212

212

    def _check_revs_present(self, br2):

213

 

        for rev_id in '1-1', '1-2', '2-1':

 

213

        for rev_id in [b'1-1', b'1-2', b'2-1']:

214

214

            self.assertTrue(br2.repository.has_revision(rev_id))

215

215

            rev = br2.repository.get_revision(rev_id)

216

216

            self.assertEqual(rev.revision_id, rev_id)

290

290

        # precondition

291

291

        self.assertTrue(target._format._fetch_uses_deltas)

292

292

        target.fetch(source, revision_id=b'rev-one')

293

 

        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],

 

293

        self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],

294

294

                          target._format._fetch_order, False),

295

295

                         self.find_get_record_stream(source.texts.calls))

296

 

        self.assertEqual(('get_record_stream', [('rev-one',)],

 

296

        self.assertEqual(('get_record_stream', [(b'rev-one',)],

297

297

          target._format._fetch_order, False),

298

298

          self.find_get_record_stream(source.inventories.calls, 2))

299

 

        self.assertEqual(('get_record_stream', [('rev-one',)],

 

299

        self.assertEqual(('get_record_stream', [(b'rev-one',)],

300

300

                          target._format._fetch_order, False),

301

301

                         self.find_get_record_stream(source.revisions.calls))

302

302

        # XXX: Signatures is special, and slightly broken. The

307

307

        # So we know there will be extra calls, but the *last* one is the one

308

308

        # we care about.

309

309

        signature_calls = source.signatures.calls[-1:]

310

 

        self.assertEqual(('get_record_stream', [('rev-one',)],

 

310

        self.assertEqual(('get_record_stream', [(b'rev-one',)],

311

311

                          target._format._fetch_order, False),

312

312

                         self.find_get_record_stream(signature_calls))

313

313

 

330

330

        # XXX: This won't work in general, but for the dirstate format it does.

331

331

        self.overrideAttr(target._format, '_fetch_uses_deltas', False)

332

332

        target.fetch(source, revision_id=b'rev-one')

333

 

        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],

 

333

        self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],

334

334

                          target._format._fetch_order, True),

335

335

                         self.find_get_record_stream(source.texts.calls))

336

 

        self.assertEqual(('get_record_stream', [('rev-one',)],

 

336

        self.assertEqual(('get_record_stream', [(b'rev-one',)],

337

337

            target._format._fetch_order, True),

338

338

            self.find_get_record_stream(source.inventories.calls, 2))

339

 

        self.assertEqual(('get_record_stream', [('rev-one',)],

 

339

        self.assertEqual(('get_record_stream', [(b'rev-one',)],

340

340

                          target._format._fetch_order, True),

341

341

                         self.find_get_record_stream(source.revisions.calls))

342

342

        # XXX: Signatures is special, and slightly broken. The

347

347

        # So we know there will be extra calls, but the *last* one is the one

348

348

        # we care about.

349

349

        signature_calls = source.signatures.calls[-1:]

350

 

        self.assertEqual(('get_record_stream', [('rev-one',)],

 

350

        self.assertEqual(('get_record_stream', [(b'rev-one',)],

351

351

                          target._format._fetch_order, True),

352

352

                         self.find_get_record_stream(signature_calls))

353

353

 

370

370

        # Ensure that we stored a delta

371

371

        source.lock_read()

372

372

        self.addCleanup(source.unlock)

373

 

        record = next(source.revisions.get_record_stream([('rev-two',)],

 

373

        record = next(source.revisions.get_record_stream([(b'rev-two',)],

374

374

            'unordered', False))

375

375

        self.assertEqual('knit-delta-gz', record.storage_kind)

376

376

        target.fetch(tree.branch.repository, revision_id=b'rev-two')

377

377

        # The record should get expanded back to a fulltext

378

378

        target.lock_read()

379

379

        self.addCleanup(target.unlock)

380

 

        record = next(target.revisions.get_record_stream([('rev-two',)],

 

380

        record = next(target.revisions.get_record_stream([(b'rev-two',)],

381

381

            'unordered', False))

382

382

        self.assertEqual('knit-ft-gz', record.storage_kind)

383

383

 

402

402

        # random ids because otherwise the inventory fulltext compresses too

403

403

        # well and the deltas get bigger.

404

404

        to_add = [

405

 

            ('add', ('', 'TREE_ROOT', 'directory', None))]

 

405

            ('add', ('', b'TREE_ROOT', 'directory', None))]

406

406

        for i in range(10):

407

407

            fname = 'file%03d' % (i,)

408

 

            fileid = '%s-%s' % (fname, osutils.rand_chars(64))

409

 

            to_add.append(('add', (fname, fileid, 'file', 'content\n')))

 

408

            fileid = ('%s-%s' % (fname, osutils.rand_chars(64))).encode('ascii')

 

409

            to_add.append(('add', (fname, fileid, 'file', b'content\n')))

410

410

        builder.build_snapshot(None, to_add, revision_id=b'A')

411

 

        builder.build_snapshot(['A'], [], revision_id=b'B')

412

 

        builder.build_snapshot(['A'], [], revision_id=b'C')

413

 

        builder.build_snapshot(['C'], [], revision_id=b'D')

414

 

        builder.build_snapshot(['D'], [], revision_id=b'E')

415

 

        builder.build_snapshot(['E', 'B'], [], revision_id=b'F')

 

411

        builder.build_snapshot([b'A'], [], revision_id=b'B')

 

412

        builder.build_snapshot([b'A'], [], revision_id=b'C')

 

413

        builder.build_snapshot([b'C'], [], revision_id=b'D')

 

414

        builder.build_snapshot([b'D'], [], revision_id=b'E')

 

415

        builder.build_snapshot([b'E', b'B'], [], revision_id=b'F')

416

416

        builder.finish_series()

417

417

        source_branch = builder.get_branch()

418

418

        source_branch.controldir.sprout('base', revision_id=b'B')

423

423

        self.addCleanup(source.unlock)

424

424

        source.inventories = versionedfile.OrderingVersionedFilesDecorator(

425

425

                        source.inventories,

426

 

                        key_priority={('E',): 1, ('D',): 2, ('C',): 4,

427

 

                                      ('F',): 3})

 

426

                        key_priority={(b'E',): 1, (b'D',): 2, (b'C',): 4,

 

427

                                      (b'F',): 3})

428

428

        # Ensure that the content is yielded in the proper order, and given as

429

429

        # the expected kinds

430

430

        records = [(record.key, record.storage_kind)

431

431

                   for record in source.inventories.get_record_stream(

432

 

                        [('D',), ('C',), ('E',), ('F',)], 'unordered', False)]

433

 

        self.assertEqual([(('E',), 'knit-delta-gz'), (('D',), 'knit-delta-gz'),

434

 

                          (('F',), 'knit-delta-gz'), (('C',), 'knit-delta-gz')],

 

432

                        [(b'D',), (b'C',), (b'E',), (b'F',)], 'unordered', False)]

 

433

        self.assertEqual([((b'E',), 'knit-delta-gz'), ((b'D',), 'knit-delta-gz'),

 

434

                          ((b'F',), 'knit-delta-gz'), ((b'C',), 'knit-delta-gz')],

435

435

                          records)

436

436

 

437

437

        target_branch.lock_write()

441

441

        # 'C' should be expanded to a fulltext, but D and E should still be

442

442

        # deltas

443

443

        stream = target.inventories.get_record_stream(

444

 

            [('C',), ('D',), ('E',), ('F',)],

 

444

            [(b'C',), (b'D',), (b'E',), (b'F',)],

445

445

            'unordered', False)

446

446

        kinds = dict((record.key, record.storage_kind) for record in stream)

447

 

        self.assertEqual({('C',): 'knit-ft-gz', ('D',): 'knit-delta-gz',

448

 

                          ('E',): 'knit-delta-gz', ('F',): 'knit-delta-gz'},

 

447

        self.assertEqual({(b'C',): 'knit-ft-gz', (b'D',): 'knit-delta-gz',

 

448

                          (b'E',): 'knit-delta-gz', (b'F',): 'knit-delta-gz'},

449

449

                         kinds)

450

450

 

451

451

 

471

471

 

472

472

    def test_fetch_order_AB(self):

473

473

        """See do_fetch_order_test"""

474

 

        self.do_fetch_order_test('A', 'B')

 

474

        self.do_fetch_order_test(b'A', b'B')

475

475

 

476

476

    def test_fetch_order_BA(self):

477

477

        """See do_fetch_order_test"""

478

 

        self.do_fetch_order_test('B', 'A')

 

478

        self.do_fetch_order_test(b'B', b'A')

479

479

 

480

480

    def get_parents(self, file_id, revision_id):

481

481

        self.repo.lock_read()

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0