equal
deleted
inserted
replaced
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 |