~jelmer/brz-svn/trunk

« back to all changes in this revision

Viewing changes to repository.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:
544
544
    def _cache_add_new_revision(self, revnum, revid, parents):
545
545
        assert self.is_locked()
546
546
        assert type(parents) == tuple or parents is None
547
 
        self._cached_revnum = max(revnum, self._cached_revnum)
 
547
        if self._cached_revnum is None:
 
548
            self._cached_revnum = revnum
 
549
        else:
 
550
            self._cached_revnum = max(revnum, self._cached_revnum)
548
551
        if parents == () and revid != NULL_REVISION:
549
552
            parents = (NULL_REVISION,)
550
553
        parents_cache = self._parents_provider._cache
1057
1060
        return self.lookup_foreign_revision_id(foreign_revid, mapping)
1058
1061
 
1059
1062
    def lookup_bzr_revision_id(self, revid, layout=None, ancestry=None,
1060
 
                           project=None, foreign_sibling=None):
 
1063
                               project=None, foreign_sibling=None):
1061
1064
        """Parse an existing Subversion-based revision id.
1062
1065
 
1063
1066
        :param revid: The revision id.