Show More
@@ -1022,10 +1022,13 b' def overridesummary(orig, ui, repo, *pat' | |||||
1022 | if opts.pop('large', None): |
|
1022 | if opts.pop('large', None): | |
1023 | toupload = getoutgoinglfiles(ui, repo, None, **opts) |
|
1023 | toupload = getoutgoinglfiles(ui, repo, None, **opts) | |
1024 | if toupload is None: |
|
1024 | if toupload is None: | |
|
1025 | # i18n: column positioning for "hg summary" | |||
1025 | ui.status(_('largefiles: No remote repo\n')) |
|
1026 | ui.status(_('largefiles: No remote repo\n')) | |
1026 | elif not toupload: |
|
1027 | elif not toupload: | |
|
1028 | # i18n: column positioning for "hg summary" | |||
1027 | ui.status(_('largefiles: (no files to upload)\n')) |
|
1029 | ui.status(_('largefiles: (no files to upload)\n')) | |
1028 | else: |
|
1030 | else: | |
|
1031 | # i18n: column positioning for "hg summary" | |||
1029 | ui.status(_('largefiles: %d to upload\n') % len(toupload)) |
|
1032 | ui.status(_('largefiles: %d to upload\n') % len(toupload)) | |
1030 |
|
1033 | |||
1031 | def scmutiladdremove(orig, repo, pats=[], opts={}, dry_run=None, |
|
1034 | def scmutiladdremove(orig, repo, pats=[], opts={}, dry_run=None, |
@@ -3563,6 +3563,7 b' def summary(orig, ui, repo, *args, **kwa' | |||||
3563 | if m: |
|
3563 | if m: | |
3564 | ui.write("mq: %s\n" % ', '.join(m)) |
|
3564 | ui.write("mq: %s\n" % ', '.join(m)) | |
3565 | else: |
|
3565 | else: | |
|
3566 | # i18n: column positioning for "hg summary" | |||
3566 | ui.note(_("mq: (empty queue)\n")) |
|
3567 | ui.note(_("mq: (empty queue)\n")) | |
3567 | return r |
|
3568 | return r | |
3568 |
|
3569 |
@@ -5464,6 +5464,7 b' def summary(ui, repo, **opts):' | |||||
5464 | for p in parents: |
|
5464 | for p in parents: | |
5465 | # label with log.changeset (instead of log.parent) since this |
|
5465 | # label with log.changeset (instead of log.parent) since this | |
5466 | # shows a working directory parent *changeset*: |
|
5466 | # shows a working directory parent *changeset*: | |
|
5467 | # i18n: column positioning for "hg summary" | |||
5467 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
|
5468 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), | |
5468 | label='log.changeset changeset.%s' % p.phasestr()) |
|
5469 | label='log.changeset changeset.%s' % p.phasestr()) | |
5469 | ui.write(' '.join(p.tags()), label='log.tag') |
|
5470 | ui.write(' '.join(p.tags()), label='log.tag') | |
@@ -5481,6 +5482,7 b' def summary(ui, repo, **opts):' | |||||
5481 |
|
5482 | |||
5482 | branch = ctx.branch() |
|
5483 | branch = ctx.branch() | |
5483 | bheads = repo.branchheads(branch) |
|
5484 | bheads = repo.branchheads(branch) | |
|
5485 | # i18n: column positioning for "hg summary" | |||
5484 | m = _('branch: %s\n') % branch |
|
5486 | m = _('branch: %s\n') % branch | |
5485 | if branch != 'default': |
|
5487 | if branch != 'default': | |
5486 | ui.write(m, label='log.branch') |
|
5488 | ui.write(m, label='log.branch') | |
@@ -5489,6 +5491,7 b' def summary(ui, repo, **opts):' | |||||
5489 |
|
5491 | |||
5490 | if marks: |
|
5492 | if marks: | |
5491 | current = repo._bookmarkcurrent |
|
5493 | current = repo._bookmarkcurrent | |
|
5494 | # i18n: column positioning for "hg summary" | |||
5492 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
5495 | ui.write(_('bookmarks:'), label='log.bookmark') | |
5493 | if current is not None: |
|
5496 | if current is not None: | |
5494 | try: |
|
5497 | try: | |
@@ -5554,8 +5557,10 b' def summary(ui, repo, **opts):' | |||||
5554 | t += _(' (new branch head)') |
|
5557 | t += _(' (new branch head)') | |
5555 |
|
5558 | |||
5556 | if cleanworkdir: |
|
5559 | if cleanworkdir: | |
|
5560 | # i18n: column positioning for "hg summary" | |||
5557 | ui.status(_('commit: %s\n') % t.strip()) |
|
5561 | ui.status(_('commit: %s\n') % t.strip()) | |
5558 | else: |
|
5562 | else: | |
|
5563 | # i18n: column positioning for "hg summary" | |||
5559 | ui.write(_('commit: %s\n') % t.strip()) |
|
5564 | ui.write(_('commit: %s\n') % t.strip()) | |
5560 |
|
5565 | |||
5561 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
5566 | # all ancestors of branch heads - all ancestors of parent = new csets | |
@@ -5573,10 +5578,13 b' def summary(ui, repo, **opts):' | |||||
5573 | new = sum(new) |
|
5578 | new = sum(new) | |
5574 |
|
5579 | |||
5575 | if new == 0: |
|
5580 | if new == 0: | |
|
5581 | # i18n: column positioning for "hg summary" | |||
5576 | ui.status(_('update: (current)\n')) |
|
5582 | ui.status(_('update: (current)\n')) | |
5577 | elif pnode not in bheads: |
|
5583 | elif pnode not in bheads: | |
|
5584 | # i18n: column positioning for "hg summary" | |||
5578 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
5585 | ui.write(_('update: %d new changesets (update)\n') % new) | |
5579 | else: |
|
5586 | else: | |
|
5587 | # i18n: column positioning for "hg summary" | |||
5580 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
5588 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % | |
5581 | (new, len(bheads))) |
|
5589 | (new, len(bheads))) | |
5582 |
|
5590 | |||
@@ -5618,8 +5626,10 b' def summary(ui, repo, **opts):' | |||||
5618 | t.append(_('%d outgoing bookmarks') % len(diff)) |
|
5626 | t.append(_('%d outgoing bookmarks') % len(diff)) | |
5619 |
|
5627 | |||
5620 | if t: |
|
5628 | if t: | |
|
5629 | # i18n: column positioning for "hg summary" | |||
5621 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
5630 | ui.write(_('remote: %s\n') % (', '.join(t))) | |
5622 | else: |
|
5631 | else: | |
|
5632 | # i18n: column positioning for "hg summary" | |||
5623 | ui.status(_('remote: (synced)\n')) |
|
5633 | ui.status(_('remote: (synced)\n')) | |
5624 |
|
5634 | |||
5625 | @command('tag', |
|
5635 | @command('tag', |
General Comments 0
You need to be logged in to leave comments.
Login now