~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-08-01 09:20:55 UTC
mfrom: (6437.67.1 2.5.2-dev)
mto: (6548.1.1 trunk) (6437.77.1 2.5) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6549.
Revision ID: pqm@pqm.ubuntu.com-20120801092055-5sxxreh2v28enii1

(vila) Fixes '-d' handling for 'bzr config' (Wouter van Heyst)

added added

removed removed

364

self.assertLength(5, self.hpss_calls)

365

self.assertLength(1, self.hpss_connections)

366

self.assertThat(self.hpss_calls, ContainsNoVfsCalls)

367

368

369

class TestConfigDirectory(tests.TestCaseWithTransport):

370

371

def test_parent_alias(self):

372

t = self.make_branch_and_tree('base')

373

t.branch.get_config_stack().set('test', 'base')

374

clone = t.branch.bzrdir.sprout('clone').open_branch()

375

clone.get_config_stack().set('test', 'clone')

376

out, err = self.run_bzr(['config', '-d', ':parent', 'test'],

377

working_dir='clone')

378

self.assertEquals('base\n', out)