equal
deleted
inserted
replaced
3703 # label with log.changeset (instead of log.parent) since this |
3703 # label with log.changeset (instead of log.parent) since this |
3704 # shows a working directory parent *changeset*: |
3704 # shows a working directory parent *changeset*: |
3705 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
3705 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
3706 label='log.changeset') |
3706 label='log.changeset') |
3707 ui.write(' '.join(p.tags()), label='log.tag') |
3707 ui.write(' '.join(p.tags()), label='log.tag') |
|
3708 if p.bookmarks(): |
|
3709 ui.write(' ' + ' '.join(p.bookmarks()), label='log.bookmark') |
3708 if p.rev() == -1: |
3710 if p.rev() == -1: |
3709 if not len(repo): |
3711 if not len(repo): |
3710 ui.write(_(' (empty repository)')) |
3712 ui.write(_(' (empty repository)')) |
3711 else: |
3713 else: |
3712 ui.write(_(' (no revision checked out)')) |
3714 ui.write(_(' (no revision checked out)')) |
3822 o = discovery.findoutgoing(repo, other) |
3824 o = discovery.findoutgoing(repo, other) |
3823 repo.ui.popbuffer() |
3825 repo.ui.popbuffer() |
3824 o = repo.changelog.nodesbetween(o, None)[0] |
3826 o = repo.changelog.nodesbetween(o, None)[0] |
3825 if o: |
3827 if o: |
3826 t.append(_('%d outgoing') % len(o)) |
3828 t.append(_('%d outgoing') % len(o)) |
|
3829 if 'bookmarks' in other.listkeys('namespaces'): |
|
3830 lmarks = repo.listkeys('bookmarks') |
|
3831 rmarks = other.listkeys('bookmarks') |
|
3832 diff = set(rmarks) - set(lmarks) |
|
3833 if len(diff) > 0: |
|
3834 t.append(_('%d incoming bookmarks') % len(diff)) |
|
3835 diff = set(lmarks) - set(rmarks) |
|
3836 if len(diff) > 0: |
|
3837 t.append(_('%d outgoing bookmarks') % len(diff)) |
3827 |
3838 |
3828 if t: |
3839 if t: |
3829 ui.write(_('remote: %s\n') % (', '.join(t))) |
3840 ui.write(_('remote: %s\n') % (', '.join(t))) |
3830 else: |
3841 else: |
3831 ui.status(_('remote: (synced)\n')) |
3842 ui.status(_('remote: (synced)\n')) |