equal
deleted
inserted
replaced
4718 """ |
4718 """ |
4719 |
4719 |
4720 ctx = repo[None] |
4720 ctx = repo[None] |
4721 parents = ctx.parents() |
4721 parents = ctx.parents() |
4722 pnode = parents[0].node() |
4722 pnode = parents[0].node() |
|
4723 marks = [] |
4723 |
4724 |
4724 for p in parents: |
4725 for p in parents: |
4725 # label with log.changeset (instead of log.parent) since this |
4726 # label with log.changeset (instead of log.parent) since this |
4726 # shows a working directory parent *changeset*: |
4727 # shows a working directory parent *changeset*: |
4727 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
4728 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
4728 label='log.changeset') |
4729 label='log.changeset') |
4729 ui.write(' '.join(p.tags()), label='log.tag') |
4730 ui.write(' '.join(p.tags()), label='log.tag') |
4730 if p.bookmarks(): |
4731 if p.bookmarks(): |
4731 ui.write(' ' + ' '.join(p.bookmarks()), label='log.bookmark') |
4732 marks.extend(p.bookmarks()) |
4732 if p.rev() == -1: |
4733 if p.rev() == -1: |
4733 if not len(repo): |
4734 if not len(repo): |
4734 ui.write(_(' (empty repository)')) |
4735 ui.write(_(' (empty repository)')) |
4735 else: |
4736 else: |
4736 ui.write(_(' (no revision checked out)')) |
4737 ui.write(_(' (no revision checked out)')) |
4744 m = _('branch: %s\n') % branch |
4745 m = _('branch: %s\n') % branch |
4745 if branch != 'default': |
4746 if branch != 'default': |
4746 ui.write(m, label='log.branch') |
4747 ui.write(m, label='log.branch') |
4747 else: |
4748 else: |
4748 ui.status(m, label='log.branch') |
4749 ui.status(m, label='log.branch') |
|
4750 |
|
4751 if marks: |
|
4752 current = repo._bookmarkcurrent |
|
4753 if current is not None: |
|
4754 try: |
|
4755 marks.remove(current) |
|
4756 marks = ['*' + current] + marks |
|
4757 except ValueError: |
|
4758 # current bookmark not in parent ctx marks |
|
4759 pass |
|
4760 ui.write(_('bookmarks: %s\n') % ' '.join(marks), label='log.bookmark') |
4749 |
4761 |
4750 st = list(repo.status(unknown=True))[:6] |
4762 st = list(repo.status(unknown=True))[:6] |
4751 |
4763 |
4752 c = repo.dirstate.copies() |
4764 c = repo.dirstate.copies() |
4753 copied, renamed = [], [] |
4765 copied, renamed = [], [] |