equal
deleted
inserted
replaced
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 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'!" |
456 ) % (short(dhs[0]), repo[dhs[0]].bookmarks()[0]) |
456 ) % (short(dhs[0]), repo[dhs[0]].bookmarks()[0]) |