← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-05-24 13:09:59 UTC
  • mfrom: (2490.1.4 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
(Kent Gibson) Update the LogFormatter API to use a LogRevision object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2965
2965
    def run(self, other_branch=None, reverse=False, mine_only=False,
2966
2966
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
2967
2967
            show_ids=False, verbose=False):
2968
 
        from bzrlib.missing import find_unmerged, iter_log_data
 
2968
        from bzrlib.missing import find_unmerged, iter_log_revisions
2969
2969
        from bzrlib.log import log_formatter
2970
2970
        local_branch = Branch.open_containing(u".")[0]
2971
2971
        parent = local_branch.get_parent()
2996
2996
                    remote_extra.reverse()
2997
2997
                if local_extra and not theirs_only:
2998
2998
                    print "You have %d extra revision(s):" % len(local_extra)
2999
 
                    for data in iter_log_data(local_extra, local_branch.repository,
3000
 
                                              verbose):
3001
 
                        lf.show(*data)
 
2999
                    for revision in iter_log_revisions(local_extra, 
 
3000
                                        local_branch.repository,
 
3001
                                        verbose):
 
3002
                        lf.log_revision(revision)
3002
3003
                    printed_local = True
3003
3004
                else:
3004
3005
                    printed_local = False
3006
3007
                    if printed_local is True:
3007
3008
                        print "\n\n"
3008
3009
                    print "You are missing %d revision(s):" % len(remote_extra)
3009
 
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
3010
 
                                              verbose):
3011
 
                        lf.show(*data)
 
3010
                    for revision in iter_log_revisions(remote_extra, 
 
3011
                                        remote_branch.repository, 
 
3012
                                        verbose):
 
3013
                        lf.log_revision(revision)
3012
3014
                if not remote_extra and not local_extra:
3013
3015
                    status_code = 0
3014
3016
                    print "Branches are up to date."