Show More
| @@ -463,12 +463,16 b' def incoming(ui, repo, other):' | |||||
| 463 | def add(b, id, st): |
|
463 | def add(b, id, st): | |
| 464 | incomings.append(" %-25s %s\n" % (b, getid(id))) |
|
464 | incomings.append(" %-25s %s\n" % (b, getid(id))) | |
| 465 | for b, scid, dcid in addsrc: |
|
465 | for b, scid, dcid in addsrc: | |
|
|
466 | # i18n: "added" refers to a bookmark | |||
| 466 | add(b, scid, _('added')) |
|
467 | add(b, scid, _('added')) | |
| 467 | for b, scid, dcid in advsrc: |
|
468 | for b, scid, dcid in advsrc: | |
|
|
469 | # i18n: "advanced" refers to a bookmark | |||
| 468 | add(b, scid, _('advanced')) |
|
470 | add(b, scid, _('advanced')) | |
| 469 | for b, scid, dcid in diverge: |
|
471 | for b, scid, dcid in diverge: | |
|
|
472 | # i18n: "diverged" refers to a bookmark | |||
| 470 | add(b, scid, _('diverged')) |
|
473 | add(b, scid, _('diverged')) | |
| 471 | for b, scid, dcid in differ: |
|
474 | for b, scid, dcid in differ: | |
|
|
475 | # i18n: "changed" refers to a bookmark | |||
| 472 | add(b, scid, _('changed')) |
|
476 | add(b, scid, _('changed')) | |
| 473 |
|
477 | |||
| 474 | if not incomings: |
|
478 | if not incomings: | |
| @@ -501,14 +505,19 b' def outgoing(ui, repo, other):' | |||||
| 501 | def add(b, id, st): |
|
505 | def add(b, id, st): | |
| 502 | outgoings.append(" %-25s %s\n" % (b, getid(id))) |
|
506 | outgoings.append(" %-25s %s\n" % (b, getid(id))) | |
| 503 | for b, scid, dcid in addsrc: |
|
507 | for b, scid, dcid in addsrc: | |
|
|
508 | # i18n: "added refers to a bookmark | |||
| 504 | add(b, scid, _('added')) |
|
509 | add(b, scid, _('added')) | |
| 505 | for b, scid, dcid in adddst: |
|
510 | for b, scid, dcid in adddst: | |
|
|
511 | # i18n: "deleted" refers to a bookmark | |||
| 506 | add(b, ' ' * 40, _('deleted')) |
|
512 | add(b, ' ' * 40, _('deleted')) | |
| 507 | for b, scid, dcid in advsrc: |
|
513 | for b, scid, dcid in advsrc: | |
|
|
514 | # i18n: "advanced" refers to a bookmark | |||
| 508 | add(b, scid, _('advanced')) |
|
515 | add(b, scid, _('advanced')) | |
| 509 | for b, scid, dcid in diverge: |
|
516 | for b, scid, dcid in diverge: | |
|
|
517 | # i18n: "diverged" refers to a bookmark | |||
| 510 | add(b, scid, _('diverged')) |
|
518 | add(b, scid, _('diverged')) | |
| 511 | for b, scid, dcid in differ: |
|
519 | for b, scid, dcid in differ: | |
|
|
520 | # i18n: "changed" refers to a bookmark | |||
| 512 | add(b, scid, _('changed')) |
|
521 | add(b, scid, _('changed')) | |
| 513 |
|
522 | |||
| 514 | if not outgoings: |
|
523 | if not outgoings: | |
General Comments 0
You need to be logged in to leave comments.
Login now