~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-02-16 18:01:57 UTC
mfrom: (6437.32.2 name-nick)
mto: (6468.1.1 merge-2.5) (6437.54.1 2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (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 6469.
Revision ID: pqm@pqm.ubuntu.com-20120216180157-yegt0ppjq6tvfu7w

(abentley) Use colocated branch names as nicknames. (Aaron Bentley)

added added

removed removed

2658

self.test_home_dir = self.test_dir + "/MemoryTransportMissingHomeDir"

2659

self.permit_dir(self.test_dir)

2660

2661

def make_branch(self, relpath, format=None):

2661

def make_branch(self, relpath, format=None, name=None):

2662

"""Create a branch on the transport at relpath."""

2663

repo = self.make_repository(relpath, format=format)

2664

return repo.bzrdir.create_branch(append_revisions_only=False)

2664

return repo.bzrdir.create_branch(append_revisions_only=False,

2665

name=name)

2665

2666

2667

def get_default_format(self):

2667

2668

return 'default'