##// END OF EJS Templates
outgoing: avoid running pager until we're actually showing changes...
Augie Fackler -
r31058:d2ed0abc default
parent child Browse files
Show More
@@ -3641,13 +3641,13 b' def outgoing(ui, repo, dest=None, **opts'
3641 """
3641 """
3642 if opts.get('graph'):
3642 if opts.get('graph'):
3643 cmdutil.checkunsupportedgraphflags([], opts)
3643 cmdutil.checkunsupportedgraphflags([], opts)
3644 ui.pager('outgoing')
3645 o, other = hg._outgoing(ui, repo, dest, opts)
3644 o, other = hg._outgoing(ui, repo, dest, opts)
3646 if not o:
3645 if not o:
3647 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3646 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3648 return
3647 return
3649
3648
3650 revdag = cmdutil.graphrevs(repo, o, opts)
3649 revdag = cmdutil.graphrevs(repo, o, opts)
3650 ui.pager('outgoing')
3651 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3651 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3652 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3652 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3653 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3653 cmdutil.outgoinghooks(ui, repo, other, opts, o)
@@ -3660,13 +3660,12 b' def outgoing(ui, repo, dest=None, **opts'
3660 if 'bookmarks' not in other.listkeys('namespaces'):
3660 if 'bookmarks' not in other.listkeys('namespaces'):
3661 ui.warn(_("remote doesn't support bookmarks\n"))
3661 ui.warn(_("remote doesn't support bookmarks\n"))
3662 return 0
3662 return 0
3663 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3663 ui.pager('outgoing')
3664 ui.pager('outgoing')
3664 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3665 return bookmarks.outgoing(ui, repo, other)
3665 return bookmarks.outgoing(ui, repo, other)
3666
3666
3667 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3667 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3668 try:
3668 try:
3669 ui.pager('outgoing')
3670 return hg.outgoing(ui, repo, dest, opts)
3669 return hg.outgoing(ui, repo, dest, opts)
3671 finally:
3670 finally:
3672 del repo._subtoppath
3671 del repo._subtoppath
@@ -872,6 +872,7 b' def outgoing(ui, repo, dest, opts):'
872
872
873 if opts.get('newest_first'):
873 if opts.get('newest_first'):
874 o.reverse()
874 o.reverse()
875 ui.pager('outgoing')
875 displayer = cmdutil.show_changeset(ui, repo, opts)
876 displayer = cmdutil.show_changeset(ui, repo, opts)
876 count = 0
877 count = 0
877 for n in o:
878 for n in o:
General Comments 0
You need to be logged in to leave comments. Login now