/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 bzrlib/builtins.py

  • Committer: Andrew Bennetts
  • Date: 2007-07-04 03:12:37 UTC
  • mfrom: (2466.12.1 log_range)
  • mto: This revision was merged to the branch mainline in revision 2580.
  • Revision ID: andrew.bennetts@canonical.com-20070704031237-faouhtp7ckc4m69t
Merge Kent Gibson's fix for bug #4663, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1639
1639
                rev1 = None
1640
1640
                rev2 = None
1641
1641
            elif len(revision) == 1:
1642
 
                rev1 = rev2 = revision[0].in_history(b).revno
 
1642
                rev1 = rev2 = revision[0].in_history(b)
1643
1643
            elif len(revision) == 2:
1644
1644
                if revision[1].get_branch() != revision[0].get_branch():
1645
1645
                    # b is taken from revision[0].get_branch(), and
1648
1648
                    raise errors.BzrCommandError(
1649
1649
                        "Log doesn't accept two revisions in different"
1650
1650
                        " branches.")
1651
 
                if revision[0].spec is None:
1652
 
                    # missing begin-range means first revision
1653
 
                    rev1 = 1
1654
 
                else:
1655
 
                    rev1 = revision[0].in_history(b).revno
1656
 
 
1657
 
                if revision[1].spec is None:
1658
 
                    # missing end-range means last known revision
1659
 
                    rev2 = b.revno()
1660
 
                else:
1661
 
                    rev2 = revision[1].in_history(b).revno
 
1651
                rev1 = revision[0].in_history(b)
 
1652
                rev2 = revision[1].in_history(b)
1662
1653
            else:
1663
1654
                raise errors.BzrCommandError(
1664
1655
                    'bzr log --revision takes one or two values.')
1665
1656
 
1666
 
            # By this point, the revision numbers are converted to the +ve
1667
 
            # form if they were supplied in the -ve form, so we can do
1668
 
            # this comparison in relative safety
1669
 
            if rev1 > rev2:
1670
 
                (rev2, rev1) = (rev1, rev2)
1671
 
 
1672
1657
            if log_format is None:
1673
1658
                log_format = log.log_formatter_registry.get_default(b)
1674
1659