equal
deleted
inserted
replaced
410 heads = None |
410 heads = None |
411 else: |
411 else: |
412 heads = scmutil.nodesummaries(repo, unsyncedheads) |
412 heads = scmutil.nodesummaries(repo, unsyncedheads) |
413 if heads is None: |
413 if heads is None: |
414 repo.ui.status( |
414 repo.ui.status( |
415 _(b"remote has heads that are " b"not known locally\n") |
415 _(b"remote has heads that are not known locally\n") |
416 ) |
416 ) |
417 elif branch is None: |
417 elif branch is None: |
418 repo.ui.status( |
418 repo.ui.status( |
419 _(b"remote has heads that are " b"not known locally: %s\n") |
419 _(b"remote has heads that are not known locally: %s\n") |
420 % heads |
420 % heads |
421 ) |
421 ) |
422 else: |
422 else: |
423 repo.ui.status( |
423 repo.ui.status( |
424 _( |
424 _( |
445 dhs = sorted(newhs - nowarnheads - oldhs) |
445 dhs = sorted(newhs - nowarnheads - oldhs) |
446 if dhs: |
446 if dhs: |
447 if errormsg is None: |
447 if errormsg is None: |
448 if branch not in (b'default', None): |
448 if branch not in (b'default', None): |
449 errormsg = _( |
449 errormsg = _( |
450 b"push creates new remote head %s " b"on branch '%s'!" |
450 b"push creates new remote head %s on branch '%s'!" |
451 ) % (short(dhs[0]), branch) |
451 ) % (short(dhs[0]), branch) |
452 elif repo[dhs[0]].bookmarks(): |
452 elif repo[dhs[0]].bookmarks(): |
453 errormsg = _( |
453 errormsg = _( |
454 b"push creates new remote head %s " |
454 b"push creates new remote head %s " |
455 b"with bookmark '%s'!" |
455 b"with bookmark '%s'!" |