Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 21571:17da326fd041 stable
bookmarks: properly align multi-byte characters
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 27 May 2014 15:16:52 -0700 |
| parents | a1381eea7c7d |
| children | 652e07debf10 14560418856d |
comparison
equal
deleted
inserted
replaced
| 21570:d0ec3800101a | 21571:17da326fd041 |
|---|---|
| 949 prefix, label = ' ', '' | 949 prefix, label = ' ', '' |
| 950 | 950 |
| 951 if ui.quiet: | 951 if ui.quiet: |
| 952 ui.write("%s\n" % bmark, label=label) | 952 ui.write("%s\n" % bmark, label=label) |
| 953 else: | 953 else: |
| 954 ui.write(" %s %-25s %d:%s\n" % ( | 954 pad = " " * (25 - encoding.colwidth(bmark)) |
| 955 prefix, bmark, repo.changelog.rev(n), hexfn(n)), | 955 ui.write(" %s %s%s %d:%s\n" % ( |
| 956 prefix, bmark, pad, repo.changelog.rev(n), hexfn(n)), | |
| 956 label=label) | 957 label=label) |
| 957 | 958 |
| 958 @command('branch', | 959 @command('branch', |
| 959 [('f', 'force', None, | 960 [('f', 'force', None, |
| 960 _('set branch name even if it shadows an existing branch')), | 961 _('set branch name even if it shadows an existing branch')), |