Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 39933:f07ab9ddc0c0
resolve: rename {status} to {mergestatus} to not shadow change status (BC)
This is a part of the name unification. I think it's somewhat useful to
provide a combined view of change/merge statuses.
https://www.mercurial-scm.org/wiki/GenericTemplatingPlan#Dictionary
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 30 Sep 2018 15:15:27 +0900 |
| parents | f6874567a93b |
| children | 47cb6750dea3 |
comparison
equal
deleted
inserted
replaced
| 39932:59592ac26f85 | 39933:f07ab9ddc0c0 |
|---|---|
| 4620 continue | 4620 continue |
| 4621 | 4621 |
| 4622 label, key = mergestateinfo[ms[f]] | 4622 label, key = mergestateinfo[ms[f]] |
| 4623 fm.startitem() | 4623 fm.startitem() |
| 4624 fm.context(ctx=wctx) | 4624 fm.context(ctx=wctx) |
| 4625 fm.condwrite(not nostatus, 'status', '%s ', key, label=label) | 4625 fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label) |
| 4626 fm.write('path', '%s\n', f, label=label) | 4626 fm.write('path', '%s\n', f, label=label) |
| 4627 fm.end() | 4627 fm.end() |
| 4628 return 0 | 4628 return 0 |
| 4629 | 4629 |
| 4630 with repo.wlock(): | 4630 with repo.wlock(): |