comparison mercurial/bookmarks.py @ 24657:3d7c512b258d

bookmarks: show incoming bookmarks more exactly

Before this patch, "hg incoming -B" shows only bookmarks added
remotely. Then, users can't know about bookmarks below before "hg
pull" execution.

  - advanced remotely
  - diverged
  - changed (remote revision is unknown for local)

This patch shows such bookmarks, too.

24656:29c238e4a58a

        getid = lambda id: id[:12]
    def add(b, id):
        incomings.append("   %-25s %s\n" % (b, getid(id)))
    for b, scid, dcid in addsrc:
        add(b, scid)

    if not incomings:
        ui.status(_("no changed bookmarks found\n"))
        return 1

24657:3d7c512b258d

        getid = lambda id: id[:12]
    def add(b, id):
        incomings.append("   %-25s %s\n" % (b, getid(id)))
    for b, scid, dcid in addsrc:
        add(b, scid)
    for b, scid, dcid in advsrc:
        add(b, scid)
    for b, scid, dcid in diverge:
        add(b, scid)
    for b, scid, dcid in differ:
        add(b, scid)

    if not incomings:
        ui.status(_("no changed bookmarks found\n"))
        return 1