Show More
@@ -687,55 +687,71 b' class changeset_printer(object):' | |||||
687 | parents = [(p, hexfunc(log.node(p))) |
|
687 | parents = [(p, hexfunc(log.node(p))) | |
688 | for p in self._meaningful_parentrevs(log, rev)] |
|
688 | for p in self._meaningful_parentrevs(log, rev)] | |
689 |
|
689 | |||
|
690 | # i18n: column positioning for "hg log" | |||
690 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)), |
|
691 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)), | |
691 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
692 | label='log.changeset changeset.%s' % ctx.phasestr()) | |
692 |
|
693 | |||
693 | branch = ctx.branch() |
|
694 | branch = ctx.branch() | |
694 | # don't show the default branch name |
|
695 | # don't show the default branch name | |
695 | if branch != 'default': |
|
696 | if branch != 'default': | |
|
697 | # i18n: column positioning for "hg log" | |||
696 | self.ui.write(_("branch: %s\n") % branch, |
|
698 | self.ui.write(_("branch: %s\n") % branch, | |
697 | label='log.branch') |
|
699 | label='log.branch') | |
698 | for bookmark in self.repo.nodebookmarks(changenode): |
|
700 | for bookmark in self.repo.nodebookmarks(changenode): | |
|
701 | # i18n: column positioning for "hg log" | |||
699 | self.ui.write(_("bookmark: %s\n") % bookmark, |
|
702 | self.ui.write(_("bookmark: %s\n") % bookmark, | |
700 | label='log.bookmark') |
|
703 | label='log.bookmark') | |
701 | for tag in self.repo.nodetags(changenode): |
|
704 | for tag in self.repo.nodetags(changenode): | |
|
705 | # i18n: column positioning for "hg log" | |||
702 | self.ui.write(_("tag: %s\n") % tag, |
|
706 | self.ui.write(_("tag: %s\n") % tag, | |
703 | label='log.tag') |
|
707 | label='log.tag') | |
704 | if self.ui.debugflag and ctx.phase(): |
|
708 | if self.ui.debugflag and ctx.phase(): | |
|
709 | # i18n: column positioning for "hg log" | |||
705 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), |
|
710 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), | |
706 | label='log.phase') |
|
711 | label='log.phase') | |
707 | for parent in parents: |
|
712 | for parent in parents: | |
|
713 | # i18n: column positioning for "hg log" | |||
708 | self.ui.write(_("parent: %d:%s\n") % parent, |
|
714 | self.ui.write(_("parent: %d:%s\n") % parent, | |
709 | label='log.parent changeset.%s' % ctx.phasestr()) |
|
715 | label='log.parent changeset.%s' % ctx.phasestr()) | |
710 |
|
716 | |||
711 | if self.ui.debugflag: |
|
717 | if self.ui.debugflag: | |
712 | mnode = ctx.manifestnode() |
|
718 | mnode = ctx.manifestnode() | |
|
719 | # i18n: column positioning for "hg log" | |||
713 | self.ui.write(_("manifest: %d:%s\n") % |
|
720 | self.ui.write(_("manifest: %d:%s\n") % | |
714 | (self.repo.manifest.rev(mnode), hex(mnode)), |
|
721 | (self.repo.manifest.rev(mnode), hex(mnode)), | |
715 | label='ui.debug log.manifest') |
|
722 | label='ui.debug log.manifest') | |
|
723 | # i18n: column positioning for "hg log" | |||
716 | self.ui.write(_("user: %s\n") % ctx.user(), |
|
724 | self.ui.write(_("user: %s\n") % ctx.user(), | |
717 | label='log.user') |
|
725 | label='log.user') | |
|
726 | # i18n: column positioning for "hg log" | |||
718 | self.ui.write(_("date: %s\n") % date, |
|
727 | self.ui.write(_("date: %s\n") % date, | |
719 | label='log.date') |
|
728 | label='log.date') | |
720 |
|
729 | |||
721 | if self.ui.debugflag: |
|
730 | if self.ui.debugflag: | |
722 | files = self.repo.status(log.parents(changenode)[0], changenode)[:3] |
|
731 | files = self.repo.status(log.parents(changenode)[0], changenode)[:3] | |
723 | for key, value in zip([_("files:"), _("files+:"), _("files-:")], |
|
732 | for key, value in zip([# i18n: column positioning for "hg log" | |
724 |
files) |
|
733 | _("files:"), | |
|
734 | # i18n: column positioning for "hg log" | |||
|
735 | _("files+:"), | |||
|
736 | # i18n: column positioning for "hg log" | |||
|
737 | _("files-:")], files): | |||
725 | if value: |
|
738 | if value: | |
726 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), |
|
739 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), | |
727 | label='ui.debug log.files') |
|
740 | label='ui.debug log.files') | |
728 | elif ctx.files() and self.ui.verbose: |
|
741 | elif ctx.files() and self.ui.verbose: | |
|
742 | # i18n: column positioning for "hg log" | |||
729 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), |
|
743 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), | |
730 | label='ui.note log.files') |
|
744 | label='ui.note log.files') | |
731 | if copies and self.ui.verbose: |
|
745 | if copies and self.ui.verbose: | |
732 | copies = ['%s (%s)' % c for c in copies] |
|
746 | copies = ['%s (%s)' % c for c in copies] | |
|
747 | # i18n: column positioning for "hg log" | |||
733 | self.ui.write(_("copies: %s\n") % ' '.join(copies), |
|
748 | self.ui.write(_("copies: %s\n") % ' '.join(copies), | |
734 | label='ui.note log.copies') |
|
749 | label='ui.note log.copies') | |
735 |
|
750 | |||
736 | extra = ctx.extra() |
|
751 | extra = ctx.extra() | |
737 | if extra and self.ui.debugflag: |
|
752 | if extra and self.ui.debugflag: | |
738 | for key, value in sorted(extra.items()): |
|
753 | for key, value in sorted(extra.items()): | |
|
754 | # i18n: column positioning for "hg log" | |||
739 | self.ui.write(_("extra: %s=%s\n") |
|
755 | self.ui.write(_("extra: %s=%s\n") | |
740 | % (key, value.encode('string_escape')), |
|
756 | % (key, value.encode('string_escape')), | |
741 | label='ui.debug log.extra') |
|
757 | label='ui.debug log.extra') | |
@@ -749,6 +765,7 b' class changeset_printer(object):' | |||||
749 | label='ui.note log.description') |
|
765 | label='ui.note log.description') | |
750 | self.ui.write("\n\n") |
|
766 | self.ui.write("\n\n") | |
751 | else: |
|
767 | else: | |
|
768 | # i18n: column positioning for "hg log" | |||
752 | self.ui.write(_("summary: %s\n") % |
|
769 | self.ui.write(_("summary: %s\n") % | |
753 | description.splitlines()[0], |
|
770 | description.splitlines()[0], | |
754 | label='log.summary') |
|
771 | label='log.summary') |
General Comments 0
You need to be logged in to leave comments.
Login now