equal
deleted
inserted
replaced
5480 t.append(l % len(s)) |
5480 t.append(l % len(s)) |
5481 |
5481 |
5482 t = ', '.join(t) |
5482 t = ', '.join(t) |
5483 cleanworkdir = False |
5483 cleanworkdir = False |
5484 |
5484 |
5485 if len(parents) > 1: |
5485 if repo.vfs.exists('updatestate'): |
|
5486 t += _(' (interrupted update)') |
|
5487 elif len(parents) > 1: |
5486 t += _(' (merge)') |
5488 t += _(' (merge)') |
5487 elif branch != parents[0].branch(): |
5489 elif branch != parents[0].branch(): |
5488 t += _(' (new branch)') |
5490 t += _(' (new branch)') |
5489 elif (parents[0].closesbranch() and |
5491 elif (parents[0].closesbranch() and |
5490 pnode in repo.branchheads(branch, closed=True)): |
5492 pnode in repo.branchheads(branch, closed=True)): |