~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Committer: Jelmer Vernooij
Date: 2011-02-25 00:15:23 UTC
mfrom: (5669.3.14 controldir-component-format-registry)
mto: This revision was merged to the branch mainline in revision 5688.
Revision ID: jelmer@samba.org-20110225001523-is6u6hoxss6g58yj

Merge controldir component format branch.

files modified:
bzrlib/branch.py

bzrlib/workingtree.py

Show diffs side-by-side

added added

removed removed

bzrlib/branch.py

2383

2384

# formats which have no format string are not discoverable

2385

# and not independently creatable, so are not registered.

2386

__format4 = BzrBranchFormat4()

2386

2387

__format5 = BzrBranchFormat5()

2387

2388

__format6 = BzrBranchFormat6()

2388

2389

__format7 = BzrBranchFormat7()

2393

2394

format_registry.register(__format7)

2394

2395

format_registry.register(__format8)

2395

2396

format_registry.set_default(__format7)

2396

format_registry.register_extra(BzrBranchFormat4())

2397

format_registry.register_extra(__format4)

2398

network_format_registry.register(__format4.network_name(), __format4)

2397

2399

2398

2400

2399

2401

class BranchWriteLockResult(LogicalLockResult):

Older »