← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

All tests pass

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1753
1753
                     'long', 
1754
1754
                     'short',
1755
1755
                     'show-ids',
 
1756
                     'verbose'
1756
1757
                     ]
1757
1758
 
1758
1759
    def run(self, other_branch=None, reverse=False, mine_only=False,
1759
1760
            theirs_only=False, long=True, short=False, line=False, 
1760
 
            show_ids=False):
1761
 
        from bzrlib.missing import find_unmerged
 
1761
            show_ids=False, verbose=False):
 
1762
        from bzrlib.missing import find_unmerged, iter_log_data
1762
1763
        from bzrlib.log import log_formatter
1763
1764
        local_branch = bzrlib.branch.Branch.open_containing(".")[0]
1764
1765
        parent = local_branch.get_parent()
1778
1779
            remote_extra.reverse()
1779
1780
        if local_extra and not theirs_only:
1780
1781
            print "You have %d extra revision(s):" % len(local_extra)
1781
 
            for revno, revision_id in local_extra:
1782
 
                lf.show(revno, local_branch.get_revision(revision_id), None)
 
1782
            for data in iter_log_data(local_extra, local_branch, verbose):
 
1783
                lf.show(*data)
1783
1784
            printed_local = True
1784
1785
        else:
1785
1786
            printed_local = False
1787
1788
            if printed_local is True:
1788
1789
                print "\n\n"
1789
1790
            print "You are missing %d revision(s):" % len(remote_extra)
1790
 
            for revno, revision_id in remote_extra:
1791
 
                lf.show(revno, remote_branch.get_revision(revision_id), None)
 
1791
            for data in iter_log_data(remote_extra, remote_branch, verbose):
 
1792
                lf.show(*data)
1792
1793
        if not remote_extra and not local_extra:
1793
1794
            status_code = 0
1794
1795
            print "Branches are up to date."