~cjwatson/brz-svn/fix-http-probe

« back to all changes in this revision

Viewing changes to remote.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-03 09:16:45 UTC
  • Revision ID: jelmer@jelmer.uk-20200203091645-q0f1yq77zkr1s3cz
More Python3 / formatting / breezy fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
237
237
            raise AssertionError("SVN URL %r does not start with root %r" %
238
238
                (self.svn_url, self.svn_root_url))
239
239
 
240
 
        self._branch_path = urllib.unquote(self.svn_url[len(self.svn_root_url):])
 
240
        self._branch_path = urlutils.unquote(self.svn_url[len(self.svn_root_url):])
241
241
 
242
242
    def break_lock(self):
243
243
        pass
472
472
        if repository is None:
473
473
            repository = self.find_repository()
474
474
 
475
 
        repository.lock_write()
476
 
        try:
 
475
        with repository.lock_write():
477
476
            if mapping is None:
478
477
                mapping = repository.get_mapping()
479
478
 
500
499
            if append_revisions_only == False:
501
500
                branch.set_append_revisions_only(False)
502
501
            return branch
503
 
        finally:
504
 
            repository.unlock()
505
502
 
506
503
    def get_branch_reference(self, name=None):
507
504
        """See ControlDir.get_branch_reference()."""