← Back to branch summary

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

« back to all changes in this revision

Viewing changes to revids.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:
revids.py
31
31
    )
32
32
from breezy.lru_cache import LRUCache
33
33
 
34
 
from breezy.plugins.svn.errors import (
 
34
from .errors import (
35
35
    InvalidBzrSvnRevision,
36
36
    InvalidPropertyValue,
37
37
    warn_uuid_reuse,
38
38
    )
39
 
from breezy.plugins.svn.mapping import (
 
39
from .mapping import (
40
40
    SVN_PROP_BZR_REVISION_ID,
41
41
    find_mapping_revprops,
42
42
    find_new_lines,
236
236
        try:
237
237
            (branch_path, min_revnum, max_revnum, \
238
238
                    mapping) = self.cache.lookup_revid(revid)
239
 
            assert isinstance(branch_path, text_type)
240
 
            assert type(mapping) is str
241
 
            # Entry already complete?
242
 
            assert min_revnum <= max_revnum
243
239
            if min_revnum == max_revnum:
244
240
                return ((self.actual.repos.uuid, branch_path, min_revnum),
245
241
                        mapping_registry.parse_mapping_name("svn-" + mapping))
283
279
            (branch_path, min_revnum, max_revnum, mapping) = found
284
280
            if min_revnum == max_revnum:
285
281
                return (self.actual.repos.uuid, branch_path, min_revnum), mapping
286
 
            assert min_revnum <= max_revnum
287
 
            assert isinstance(branch_path, text_type)
 
282
            if min_revnum > max_revnum:
 
283
                raise AssertionError('%d > %d' % (min_revnum, max_revnum))
288
284
 
289
 
        ((uuid, branch_path, revnum), mapping) = self.actual.bisect_fileprop_revid_revnum(revid,
290
 
            branch_path, min_revnum, max_revnum)
291
 
        assert isinstance(branch_path, text_type)
 
285
        ((uuid, branch_path, revnum), mapping) = self.actual.bisect_fileprop_revid_revnum(
 
286
            revid, branch_path, min_revnum, max_revnum)
292
287
        self.remember_entry(revid, branch_path, revnum, revnum, mapping.name)
293
288
        return (uuid, branch_path, revnum), mapping
294
289