equal
deleted
inserted
replaced
3152 |
3152 |
3153 if len(parents) > 1: |
3153 if len(parents) > 1: |
3154 t += _(' (merge)') |
3154 t += _(' (merge)') |
3155 elif branch != parents[0].branch(): |
3155 elif branch != parents[0].branch(): |
3156 t += _(' (new branch)') |
3156 t += _(' (new branch)') |
|
3157 elif (parents[0].extra().get('close') and |
|
3158 pnode in repo.branchheads(branch, closed=True)): |
|
3159 t += _(' (head closed)') |
3157 elif (not st[0] and not st[1] and not st[2] and not st[7]): |
3160 elif (not st[0] and not st[1] and not st[2] and not st[7]): |
3158 t += _(' (clean)') |
3161 t += _(' (clean)') |
3159 cleanworkdir = True |
3162 cleanworkdir = True |
3160 elif pnode not in bheads: |
3163 elif pnode not in bheads: |
3161 t += _(' (new branch head)') |
3164 t += _(' (new branch head)') |