/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: 2017-08-29 21:29:35 UTC
  • mfrom: (6754.8.21 lock-context-2)
  • mto: This revision was merged to the branch mainline in revision 6784.
  • Revision ID: jelmer@jelmer.uk-20170829212935-lakl2jhq9sqckejp
Merge lock-context-2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/cmds.py
291
291
    def upload_full_tree(self):
292
292
        self.to_transport.ensure_base() # XXX: Handle errors (add
293
293
                                        # --create-prefix option ?)
294
 
        self.tree.lock_read()
295
 
        try:
 
294
        with self.tree.lock_read():
296
295
            for relpath, ie in self.tree.iter_entries_by_dir():
297
296
                if relpath in ('', '.bzrignore', '.bzrignore-upload'):
298
297
                    # skip root ('')
315
314
                else:
316
315
                    raise NotImplementedError
317
316
            self.set_uploaded_revid(self.rev_id)
318
 
        finally:
319
 
            self.tree.unlock()
320
317
 
321
318
    def upload_tree(self):
322
319
        # If we can't find the revid file on the remote location, upload the
340
337
        self.to_transport.ensure_base() # XXX: Handle errors (add
341
338
                                        # --create-prefix option ?)
342
339
        changes = self.tree.changes_from(from_tree)
343
 
        self.tree.lock_read()
344
 
        try:
 
340
        with self.tree.lock_read():
345
341
            for (path, id, kind) in changes.removed:
346
342
                if self.is_ignored(path):
347
343
                    if not self.quiet:
428
424
                    raise NotImplementedError
429
425
 
430
426
            self.set_uploaded_revid(self.rev_id)
431
 
        finally:
432
 
            self.tree.unlock()
433
427
 
434
428
 
435
429
class CannotUploadToWorkingTree(errors.BzrCommandError):