3278 |
3278 |
3279 t = ', '.join(t) |
3279 t = ', '.join(t) |
3280 cleanworkdir = False |
3280 cleanworkdir = False |
3281 |
3281 |
3282 if len(parents) > 1: |
3282 if len(parents) > 1: |
3283 t += ui.label(_(' (merge)'), 'ui.plain') |
3283 t += _(' (merge)') |
3284 elif branch != parents[0].branch(): |
3284 elif branch != parents[0].branch(): |
3285 t += ui.label(_(' (new branch)'), 'ui.plain') |
3285 t += _(' (new branch)') |
3286 elif (parents[0].extra().get('close') and |
3286 elif (parents[0].extra().get('close') and |
3287 pnode in repo.branchheads(branch, closed=True)): |
3287 pnode in repo.branchheads(branch, closed=True)): |
3288 t += ui.label(_(' (head closed)'), 'ui.plain') |
3288 t += _(' (head closed)') |
3289 elif (not st[0] and not st[1] and not st[2] and not st[7]): |
3289 elif (not st[0] and not st[1] and not st[2] and not st[7]): |
3290 t += ui.label(_(' (clean)'), 'ui.plain') |
3290 t += _(' (clean)') |
3291 cleanworkdir = True |
3291 cleanworkdir = True |
3292 elif pnode not in bheads: |
3292 elif pnode not in bheads: |
3293 t += ui.label(_(' (new branch head)'), 'ui.plain') |
3293 t += _(' (new branch head)') |
3294 |
3294 |
3295 if cleanworkdir: |
3295 if cleanworkdir: |
3296 ui.status(_('commit: %s\n') % t.strip(), label='ui.labeled') |
3296 ui.status(_('commit: %s\n') % t.strip()) |
3297 else: |
3297 else: |
3298 ui.write(_('commit: %s\n') % t.strip(), label='ui.labeled') |
3298 ui.write(_('commit: %s\n') % t.strip()) |
3299 |
3299 |
3300 # all ancestors of branch heads - all ancestors of parent = new csets |
3300 # all ancestors of branch heads - all ancestors of parent = new csets |
3301 new = [0] * len(repo) |
3301 new = [0] * len(repo) |
3302 cl = repo.changelog |
3302 cl = repo.changelog |
3303 for a in [cl.rev(n) for n in bheads]: |
3303 for a in [cl.rev(n) for n in bheads]: |