/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 breezy/plugins/upload/cmds.py

  • Committer: Jelmer Vernooij
  • Date: 2019-09-21 17:08:09 UTC
  • mfrom: (7389 work)
  • mto: This revision was merged to the branch mainline in revision 7390.
  • Revision ID: jelmer@jelmer.uk-20190921170809-ejewbeue585deajo
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/cmds.py
501
501
             directory)
502
502
 
503
503
        if wt:
504
 
            wt.lock_read()
505
504
            locked = wt
506
505
        else:
507
 
            branch.lock_read()
508
506
            locked = branch
509
 
        try:
 
507
        with locked.lock_read():
510
508
            if wt:
511
509
                changes = wt.changes_from(wt.basis_tree())
512
510
 
564
562
                uploader.upload_full_tree()
565
563
            else:
566
564
                uploader.upload_tree()
567
 
        finally:
568
 
            locked.unlock()
569
565
 
570
566
        # We uploaded successfully, remember it
571
567
        with branch.lock_write():