Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 9656:2ae3758526d8
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 27 Oct 2009 17:14:19 -0500 |
parents | 6d7d3f849062 64425c5a9257 |
children | f3d60543924f 71e081b88f3e |
comparison
equal
deleted
inserted
replaced
9655:6d7d3f849062 | 9656:2ae3758526d8 |
---|---|
651 self.ui.write("%d:%s\n" % (rev, short(changenode))) | 651 self.ui.write("%d:%s\n" % (rev, short(changenode))) |
652 return | 652 return |
653 | 653 |
654 log = self.repo.changelog | 654 log = self.repo.changelog |
655 date = util.datestr(ctx.date()) | 655 date = util.datestr(ctx.date()) |
656 extra = ctx.extra() | |
657 branch = extra.get("branch") | |
658 | 656 |
659 hexfunc = self.ui.debugflag and hex or short | 657 hexfunc = self.ui.debugflag and hex or short |
660 | 658 |
661 parents = [(p, hexfunc(log.node(p))) | 659 parents = [(p, hexfunc(log.node(p))) |
662 for p in self._meaningful_parentrevs(log, rev)] | 660 for p in self._meaningful_parentrevs(log, rev)] |
663 | 661 |
664 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) | 662 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) |
665 | 663 |
664 branch = ctx.branch() | |
666 # don't show the default branch name | 665 # don't show the default branch name |
667 if branch != 'default': | 666 if branch != 'default': |
668 branch = encoding.tolocal(branch) | 667 branch = encoding.tolocal(branch) |
669 self.ui.write(_("branch: %s\n") % branch) | 668 self.ui.write(_("branch: %s\n") % branch) |
670 for tag in self.repo.nodetags(changenode): | 669 for tag in self.repo.nodetags(changenode): |
689 self.ui.write(_("files: %s\n") % " ".join(ctx.files())) | 688 self.ui.write(_("files: %s\n") % " ".join(ctx.files())) |
690 if copies and self.ui.verbose: | 689 if copies and self.ui.verbose: |
691 copies = ['%s (%s)' % c for c in copies] | 690 copies = ['%s (%s)' % c for c in copies] |
692 self.ui.write(_("copies: %s\n") % ' '.join(copies)) | 691 self.ui.write(_("copies: %s\n") % ' '.join(copies)) |
693 | 692 |
693 extra = ctx.extra() | |
694 if extra and self.ui.debugflag: | 694 if extra and self.ui.debugflag: |
695 for key, value in sorted(extra.items()): | 695 for key, value in sorted(extra.items()): |
696 self.ui.write(_("extra: %s=%s\n") | 696 self.ui.write(_("extra: %s=%s\n") |
697 % (key, value.encode('string_escape'))) | 697 % (key, value.encode('string_escape'))) |
698 | 698 |