Mercurial > hg
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.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 08 Apr 2015 02:56:19 +0900 |
parents | 03c84c966ef5 |
children | 8ea893ab0572 |
comparison
equal
deleted
inserted
replaced
24656:29c238e4a58a | 24657:3d7c512b258d |
---|---|
458 getid = lambda id: id[:12] | 458 getid = lambda id: id[:12] |
459 def add(b, id): | 459 def add(b, id): |
460 incomings.append(" %-25s %s\n" % (b, getid(id))) | 460 incomings.append(" %-25s %s\n" % (b, getid(id))) |
461 for b, scid, dcid in addsrc: | 461 for b, scid, dcid in addsrc: |
462 add(b, scid) | 462 add(b, scid) |
463 for b, scid, dcid in advsrc: | |
464 add(b, scid) | |
465 for b, scid, dcid in diverge: | |
466 add(b, scid) | |
467 for b, scid, dcid in differ: | |
468 add(b, scid) | |
463 | 469 |
464 if not incomings: | 470 if not incomings: |
465 ui.status(_("no changed bookmarks found\n")) | 471 ui.status(_("no changed bookmarks found\n")) |
466 return 1 | 472 return 1 |
467 | 473 |