Mercurial > hg
comparison mercurial/discovery.py @ 35184:bc775b8cc020
scmutil: extra utility to display a reasonable amount of nodes
Push have some logic to display a reasonable amount nodes. We extract it to an
utility function to make it reusable.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 16 Nov 2017 03:52:38 +0100 |
parents | 4374e88e808c |
children | 483b5dd0f1aa |
comparison
equal
deleted
inserted
replaced
35183:9dadcb99cc17 | 35184:bc775b8cc020 |
---|---|
19 from . import ( | 19 from . import ( |
20 bookmarks, | 20 bookmarks, |
21 branchmap, | 21 branchmap, |
22 error, | 22 error, |
23 phases, | 23 phases, |
24 scmutil, | |
24 setdiscovery, | 25 setdiscovery, |
25 treediscovery, | 26 treediscovery, |
26 util, | 27 util, |
27 ) | 28 ) |
28 | 29 |
363 newhs.update(unsyncedheads) | 364 newhs.update(unsyncedheads) |
364 if unsyncedheads: | 365 if unsyncedheads: |
365 if None in unsyncedheads: | 366 if None in unsyncedheads: |
366 # old remote, no heads data | 367 # old remote, no heads data |
367 heads = None | 368 heads = None |
368 elif len(unsyncedheads) <= 4 or repo.ui.verbose: | |
369 heads = ' '.join(short(h) for h in unsyncedheads) | |
370 else: | 369 else: |
371 heads = (' '.join(short(h) for h in unsyncedheads[:4]) + | 370 heads = scmutil.nodesummaries(repo, unsyncedheads) |
372 ' ' + _("and %s others") % (len(unsyncedheads) - 4)) | |
373 if heads is None: | 371 if heads is None: |
374 repo.ui.status(_("remote has heads that are " | 372 repo.ui.status(_("remote has heads that are " |
375 "not known locally\n")) | 373 "not known locally\n")) |
376 elif branch is None: | 374 elif branch is None: |
377 repo.ui.status(_("remote has heads that are " | 375 repo.ui.status(_("remote has heads that are " |