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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-23 01:17:33 UTC
  • mfrom: (7516.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200623011733-ohfy5ukvyehd2kpf
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386223

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/log.py
404
404
            for lr in generator.iter_log_revisions():
405
405
                lf.log_revision(lr)
406
406
        except errors.GhostRevisionUnusableHere:
407
 
            raise errors.BzrCommandError(
 
407
            raise errors.CommandError(
408
408
                gettext('Further revision history missing.'))
409
409
        lf.show_advice()
410
410
 
560
560
             a list of the same tuples.
561
561
    """
562
562
    if (exclude_common_ancestry and start_rev_id == end_rev_id):
563
 
        raise errors.BzrCommandError(gettext(
 
563
        raise errors.CommandError(gettext(
564
564
            '--exclude-common-ancestry requires two different revisions'))
565
565
    if direction not in ('reverse', 'forward'):
566
566
        raise ValueError(gettext('invalid direction %r') % direction)
651
651
        except _StartNotLinearAncestor:
652
652
            # A merge was never detected so the lower revision limit can't
653
653
            # be nested down somewhere
654
 
            raise errors.BzrCommandError(gettext('Start revision not found in'
 
654
            raise errors.CommandError(gettext('Start revision not found in'
655
655
                                                 ' history of end revision.'))
656
656
 
657
657
    # We exit the loop above because we encounter a revision with merges, from
1099
1099
    if branch.last_revision() != _mod_revision.NULL_REVISION:
1100
1100
        if (start_rev_id == _mod_revision.NULL_REVISION
1101
1101
                or end_rev_id == _mod_revision.NULL_REVISION):
1102
 
            raise errors.BzrCommandError(
 
1102
            raise errors.CommandError(
1103
1103
                gettext('Logging revision 0 is invalid.'))
1104
1104
        if end_revno is not None and start_revno > end_revno:
1105
 
            raise errors.BzrCommandError(
 
1105
            raise errors.CommandError(
1106
1106
                gettext("Start revision must be older than the end revision."))
1107
1107
    return (start_rev_id, end_rev_id)
1108
1108
 
1158
1158
 
1159
1159
    if ((start_rev_id == _mod_revision.NULL_REVISION)
1160
1160
            or (end_rev_id == _mod_revision.NULL_REVISION)):
1161
 
        raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
 
1161
        raise errors.CommandError(gettext('Logging revision 0 is invalid.'))
1162
1162
    if start_revno > end_revno:
1163
 
        raise errors.BzrCommandError(gettext("Start revision must be older "
 
1163
        raise errors.CommandError(gettext("Start revision must be older "
1164
1164
                                             "than the end revision."))
1165
1165
 
1166
1166
    if end_revno < start_revno:
1858
1858
    try:
1859
1859
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1860
1860
    except KeyError:
1861
 
        raise errors.BzrCommandError(
 
1861
        raise errors.CommandError(
1862
1862
            gettext("unknown log formatter: %r") % name)
1863
1863
 
1864
1864