3208 def display(other, chlist, displayer): |
3208 def display(other, chlist, displayer): |
3209 revdag = cmdutil.graphrevs(other, chlist, opts) |
3209 revdag = cmdutil.graphrevs(other, chlist, opts) |
3210 cmdutil.displaygraph(ui, repo, revdag, displayer, |
3210 cmdutil.displaygraph(ui, repo, revdag, displayer, |
3211 graphmod.asciiedges) |
3211 graphmod.asciiedges) |
3212 |
3212 |
|
3213 ui.pager('incoming') |
3213 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
3214 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
3214 return 0 |
3215 return 0 |
3215 |
3216 |
3216 if opts.get('bundle') and opts.get('subrepos'): |
3217 if opts.get('bundle') and opts.get('subrepos'): |
3217 raise error.Abort(_('cannot combine --bundle and --subrepos')) |
3218 raise error.Abort(_('cannot combine --bundle and --subrepos')) |
3221 opts.get('branch')) |
3222 opts.get('branch')) |
3222 other = hg.peer(repo, opts, source) |
3223 other = hg.peer(repo, opts, source) |
3223 if 'bookmarks' not in other.listkeys('namespaces'): |
3224 if 'bookmarks' not in other.listkeys('namespaces'): |
3224 ui.warn(_("remote doesn't support bookmarks\n")) |
3225 ui.warn(_("remote doesn't support bookmarks\n")) |
3225 return 0 |
3226 return 0 |
|
3227 ui.pager('incoming') |
3226 ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
3228 ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
3227 return bookmarks.incoming(ui, repo, other) |
3229 return bookmarks.incoming(ui, repo, other) |
3228 |
3230 |
3229 repo._subtoppath = ui.expandpath(source) |
3231 repo._subtoppath = ui.expandpath(source) |
3230 try: |
3232 try: |
|
3233 ui.pager('incoming') |
3231 return hg.incoming(ui, repo, source, opts) |
3234 return hg.incoming(ui, repo, source, opts) |
3232 finally: |
3235 finally: |
3233 del repo._subtoppath |
3236 del repo._subtoppath |
3234 |
3237 |
3235 |
3238 |