/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/revisionspec.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-02 06:03:07 UTC
  • mfrom: (7309.1.1 merge-3.0)
  • Revision ID: breezy.the.bot@gmail.com-20190602060307-k1s62fxuqo4gtgkg
Merge the 3.0 branch.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.0/+merge/368233

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/revisionspec.py
73
73
        if not self._has_revno and self.rev_id is not None:
74
74
            try:
75
75
                self._revno = self.branch.revision_id_to_revno(self.rev_id)
76
 
            except errors.NoSuchRevision:
 
76
            except (errors.NoSuchRevision, errors.RevnoOutOfBounds):
77
77
                self._revno = None
78
78
            self._has_revno = True
79
79
        return self._revno
405
405
            try:
406
406
                revision_id = branch.dotted_revno_to_revision_id(match_revno,
407
407
                                                                 _cache_reverse=True)
408
 
            except errors.NoSuchRevision:
 
408
            except (errors.NoSuchRevision, errors.RevnoOutOfBounds):
409
409
                raise errors.InvalidRevisionSpec(self.user_spec, branch)
410
410
            else:
411
411
                # there is no traditional 'revno' for dotted-decimal revnos.
422
422
                    revno = last_revno + revno + 1
423
423
            try:
424
424
                revision_id = branch.get_rev_id(revno)
425
 
            except errors.NoSuchRevision:
 
425
            except (errors.NoSuchRevision, errors.RevnoOutOfBounds):
426
426
                raise errors.InvalidRevisionSpec(self.user_spec, branch)
427
427
        return branch, revno, revision_id
428
428
 
515
515
        revno = last_revno - offset + 1
516
516
        try:
517
517
            revision_id = context_branch.get_rev_id(revno)
518
 
        except errors.NoSuchRevision:
 
518
        except (errors.NoSuchRevision, errors.RevnoOutOfBounds):
519
519
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch)
520
520
        return revno, revision_id
521
521
 
567
567
            revno = r.revno - 1
568
568
            try:
569
569
                revision_id = branch.get_rev_id(revno, revs)
570
 
            except errors.NoSuchRevision:
 
570
            except (errors.NoSuchRevision, errors.RevnoOutOfBounds):
571
571
                raise errors.InvalidRevisionSpec(self.user_spec,
572
572
                                                 branch)
573
573
        return RevisionInfo(branch, revno, revision_id)