Show More
@@ -355,16 +355,15 b' def checkheads(pushop):' | |||||
355 | allfuturecommon, |
|
355 | allfuturecommon, | |
356 | newheads) |
|
356 | newheads) | |
357 | newhs.update(unsyncedheads) |
|
357 | newhs.update(unsyncedheads) | |
358 | unsynced = sorted(h for h in unsyncedheads if h not in discardedheads) |
|
358 | if unsyncedheads: | |
359 | if unsynced: |
|
359 | if None in unsyncedheads: | |
360 | if None in unsynced: |
|
|||
361 | # old remote, no heads data |
|
360 | # old remote, no heads data | |
362 | heads = None |
|
361 | heads = None | |
363 | elif len(unsynced) <= 4 or repo.ui.verbose: |
|
362 | elif len(unsyncedheads) <= 4 or repo.ui.verbose: | |
364 | heads = ' '.join(short(h) for h in unsynced) |
|
363 | heads = ' '.join(short(h) for h in unsyncedheads) | |
365 | else: |
|
364 | else: | |
366 | heads = (' '.join(short(h) for h in unsynced[:4]) + |
|
365 | heads = (' '.join(short(h) for h in unsyncedheads[:4]) + | |
367 | ' ' + _("and %s others") % (len(unsynced) - 4)) |
|
366 | ' ' + _("and %s others") % (len(unsyncedheads) - 4)) | |
368 | if heads is None: |
|
367 | if heads is None: | |
369 | repo.ui.status(_("remote has heads that are " |
|
368 | repo.ui.status(_("remote has heads that are " | |
370 | "not known locally\n")) |
|
369 | "not known locally\n")) |
General Comments 0
You need to be logged in to leave comments.
Login now