Mercurial > hg
comparison mercurial/bookmarks.py @ 24660:bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
Before this patch, "hg incoming -B" shows only difference of bookmarks
between two repositories, and it isn't user friendly.
This patch shows detailed status about incoming bookmarks at "hg
incoming -B".
To avoid breaking backward compatibility with other tool chains, this
patch shows status, only if --verbose is specified,
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Wed, 08 Apr 2015 02:56:19 +0900 |
| parents | 8ea893ab0572 |
| children | 8cf70c97a6e1 |
comparison
equal
deleted
inserted
replaced
| 24659:4ee00d6b0e29 | 24660:bf13b44bbb0a |
|---|---|
| 454 incomings = [] | 454 incomings = [] |
| 455 if ui.debugflag: | 455 if ui.debugflag: |
| 456 getid = lambda id: id | 456 getid = lambda id: id |
| 457 else: | 457 else: |
| 458 getid = lambda id: id[:12] | 458 getid = lambda id: id[:12] |
| 459 def add(b, id): | 459 if ui.verbose: |
| 460 incomings.append(" %-25s %s\n" % (b, getid(id))) | 460 def add(b, id, st): |
| 461 incomings.append(" %-25s %s %s\n" % (b, getid(id), st)) | |
| 462 else: | |
| 463 def add(b, id, st): | |
| 464 incomings.append(" %-25s %s\n" % (b, getid(id))) | |
| 461 for b, scid, dcid in addsrc: | 465 for b, scid, dcid in addsrc: |
| 462 add(b, scid) | 466 add(b, scid, _('added')) |
| 463 for b, scid, dcid in advsrc: | 467 for b, scid, dcid in advsrc: |
| 464 add(b, scid) | 468 add(b, scid, _('advanced')) |
| 465 for b, scid, dcid in diverge: | 469 for b, scid, dcid in diverge: |
| 466 add(b, scid) | 470 add(b, scid, _('diverged')) |
| 467 for b, scid, dcid in differ: | 471 for b, scid, dcid in differ: |
| 468 add(b, scid) | 472 add(b, scid, _('changed')) |
| 469 | 473 |
| 470 if not incomings: | 474 if not incomings: |
| 471 ui.status(_("no changed bookmarks found\n")) | 475 ui.status(_("no changed bookmarks found\n")) |
| 472 return 1 | 476 return 1 |
| 473 | 477 |