Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 27172:4d61c847e06c
summary: mention graft
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 02 Dec 2015 06:31:12 +0000 |
| parents | 3fe8cb40c9c5 |
| children | 8a8f5d71a49a |
comparison
equal
deleted
inserted
replaced
| 27171:3028ea0aff46 | 27172:4d61c847e06c |
|---|---|
| 6270 t.append(l % len(s)) | 6270 t.append(l % len(s)) |
| 6271 | 6271 |
| 6272 t = ', '.join(t) | 6272 t = ', '.join(t) |
| 6273 cleanworkdir = False | 6273 cleanworkdir = False |
| 6274 | 6274 |
| 6275 if repo.vfs.exists('graftstate'): | |
| 6276 t += _(' (graft in progress)') | |
| 6275 if repo.vfs.exists('updatestate'): | 6277 if repo.vfs.exists('updatestate'): |
| 6276 t += _(' (interrupted update)') | 6278 t += _(' (interrupted update)') |
| 6277 elif len(parents) > 1: | 6279 elif len(parents) > 1: |
| 6278 t += _(' (merge)') | 6280 t += _(' (merge)') |
| 6279 elif branch != parents[0].branch(): | 6281 elif branch != parents[0].branch(): |