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