Mercurial > hg
comparison mercurial/commands.py @ 9873:541218fbad2a stable
summary: note non-default branches with -q
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 17 Nov 2009 16:23:05 -0600 |
parents | 24bc6e414610 |
children | 5c5a08d6f85d |
comparison
equal
deleted
inserted
replaced
9872:274d8e45da78 | 9873:541218fbad2a |
---|---|
2929 if p.description(): | 2929 if p.description(): |
2930 ui.status(' ' + p.description().splitlines()[0].strip() + '\n') | 2930 ui.status(' ' + p.description().splitlines()[0].strip() + '\n') |
2931 | 2931 |
2932 branch = ctx.branch() | 2932 branch = ctx.branch() |
2933 bheads = repo.branchheads(branch) | 2933 bheads = repo.branchheads(branch) |
2934 ui.status(_('branch: %s\n') % branch) | 2934 m = _('branch: %s\n') % branch |
2935 if branch != 'default': | |
2936 ui.write(m) | |
2937 else: | |
2938 ui.status(m) | |
2935 | 2939 |
2936 st = list(repo.status(unknown=True))[:7] | 2940 st = list(repo.status(unknown=True))[:7] |
2937 ms = merge_.mergestate(repo) | 2941 ms = merge_.mergestate(repo) |
2938 st.append([f for f in ms if f == 'u']) | 2942 st.append([f for f in ms if f == 'u']) |
2939 labels = [_('%d modified'), _('%d added'), _('%d removed'), | 2943 labels = [_('%d modified'), _('%d added'), _('%d removed'), |