/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-02 01:59:40 UTC
  • mfrom: (0.200.1791 work)
  • mto: (0.200.1795 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180302015940-41gwnoymxc2go3bq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
297
297
    network_format_registry as branch_network_format_registry,
298
298
    )
299
299
branch_network_format_registry.register_lazy('git',
300
 
    __name__ + '.branch', 'GitBranchFormat')
 
300
    __name__ + '.branch', 'LocalGitBranchFormat')
 
301
 
301
302
 
302
303
from ...branch import (
303
304
    format_registry as branch_format_registry,
304
305
    )
305
306
branch_format_registry.register_extra_lazy(
306
307
    __name__ + '.branch',
307
 
    'GitBranchFormat',
308
 
    )
 
308
    'LocalGitBranchFormat',
 
309
    )
 
310
branch_format_registry.register_extra_lazy(
 
311
    __name__ + '.remote',
 
312
    'RemoteGitBranchFormat',
 
313
    )
 
314
 
309
315
 
310
316
from ...workingtree import (
311
317
    format_registry as workingtree_format_registry,
386
392
 
387
393
    from .object_store import BazaarObjectStore
388
394
    store = BazaarObjectStore(repository)
389
 
    store.lock_write()
390
 
    try:
 
395
    with store.lock_write():
391
396
        try:
392
397
            parent_revisions = set(repository.get_parent_map([revid])[revid])
393
398
        except KeyError:
397
402
        if not missing_revisions:
398
403
            # Only update if the cache was up to date previously
399
404
            store._update_sha_map_revision(revid)
400
 
    finally:
401
 
        store.unlock()
402
405
 
403
406
 
404
407
def post_commit_update_cache(local_branch, master_branch, old_revno, old_revid,