comparison mercurial/commands.py @ 11310:ac873ecfc3c2

Backed out changeset: e1dde7363601

11302:e1dde7363601

    t = ', '.join(t)
    cleanworkdir = False

    if len(parents) > 1:
        t += ui.label(_(' (merge)'), 'ui.plain')
    elif branch != parents[0].branch():
        t += ui.label(_(' (new branch)'), 'ui.plain')
    elif (parents[0].extra().get('close') and
          pnode in repo.branchheads(branch, closed=True)):
        t += ui.label(_(' (head closed)'), 'ui.plain')
    elif (not st[0] and not st[1] and not st[2] and not st[7]):
        t += ui.label(_(' (clean)'), 'ui.plain')
        cleanworkdir = True
    elif pnode not in bheads:
        t += ui.label(_(' (new branch head)'), 'ui.plain')

    if cleanworkdir:
        ui.status(_('commit: %s\n') % t.strip(), label='ui.labeled')
    else:
        ui.write(_('commit: %s\n') % t.strip(), label='ui.labeled')

    # all ancestors of branch heads - all ancestors of parent = new csets
    new = [0] * len(repo)
    cl = repo.changelog
    for a in [cl.rev(n) for n in bheads]:

11310:ac873ecfc3c2

    t = ', '.join(t)
    cleanworkdir = False

    if len(parents) > 1:
        t += _(' (merge)')
    elif branch != parents[0].branch():
        t += _(' (new branch)')
    elif (parents[0].extra().get('close') and
          pnode in repo.branchheads(branch, closed=True)):
        t += _(' (head closed)')
    elif (not st[0] and not st[1] and not st[2] and not st[7]):
        t += _(' (clean)')
        cleanworkdir = True
    elif pnode not in bheads:
        t += _(' (new branch head)')

    if cleanworkdir:
        ui.status(_('commit: %s\n') % t.strip())
    else:
        ui.write(_('commit: %s\n') % t.strip())

    # all ancestors of branch heads - all ancestors of parent = new csets
    new = [0] * len(repo)
    cl = repo.changelog
    for a in [cl.rev(n) for n in bheads]: