← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tags.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:
tags.py
36
36
from breezy.tag import BasicTags
37
37
from breezy.trace import mutter
38
38
 
39
 
from breezy.plugins.svn import (
 
39
from . import (
40
40
    errors as svn_errors,
41
41
    )
42
 
from breezy.plugins.svn.mapping import (
 
42
from .mapping import (
43
43
    SVN_REVPROP_BZR_SKIP,
44
44
    mapping_registry,
45
45
    )
46
 
from breezy.plugins.svn.transport import (
 
46
from .transport import (
47
47
    check_dirs_exist,
48
48
    create_branch_prefix,
49
49
    )
130
130
            self._by_foreign_revid.setdefault(revmeta.metarev.get_foreign_revid(), []).append(name)
131
131
 
132
132
    def _lookup_revid(self, revid):
133
 
        return self.repository.lookup_bzr_revision_id(revid,
134
 
            project=self.project)
 
133
        return self.repository.lookup_bzr_revision_id(
 
134
            revid, project=self.project)
135
135
 
136
 
    def has_key(self, revid):
 
136
    def __contains__(self, revid):
137
137
        foreign_revid, mapping = self._lookup_revid(revid)
138
 
        return self._by_foreign_revid.has_key(foreign_revid)
139
 
 
140
 
    __contains__ = has_key
 
138
        return foreign_revid in self._by_foreign_revid
141
139
 
142
140
    def get(self, revid, default=None):
143
141
        foreign_revid, mapping = self._lookup_revid(revid)
383
381
            # no tags in the source, and we don't want to clobber anything
384
382
            # that's in the destination
385
383
            return {}, []
386
 
        to_tags.branch.lock_write()
387
 
        try:
 
384
        with to_tags.branch.lock_write():
388
385
            graph = to_tags.branch.repository.get_graph()
389
386
            source_dict = self._resolve_tags_ancestry(tag_revmetas,
390
387
                graph, to_tags.branch.last_revision())
395
392
            if ret[0] != dest_dict:
396
393
                to_tags._set_tag_dict(ret[0])
397
394
            return (ret[1], ret[2])
398
 
        finally:
399
 
            to_tags.branch.unlock()