| Alphare |
| hg-reviewers |
This is the new shiny API.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (2 lines) |
| if normal: | if normal: | ||||
| normal(f) | normal(f) | ||||
| for f in actions[b'add'][0]: | for f in actions[b'add'][0]: | ||||
| # Don't checkout modified files, they are already created by the diff | # Don't checkout modified files, they are already created by the diff | ||||
| if f not in newlyaddedandmodifiedfiles: | if f not in newlyaddedandmodifiedfiles: | ||||
| prntstatusmsg(b'add', f) | prntstatusmsg(b'add', f) | ||||
| checkout(f) | checkout(f) | ||||
| repo.dirstate.add(f) | repo.dirstate.set_tracked(f) | ||||
| normal = repo.dirstate.normallookup | normal = repo.dirstate.normallookup | ||||
| if node == parent and p2 == repo.nullid: | if node == parent and p2 == repo.nullid: | ||||
| normal = repo.dirstate.normal | normal = repo.dirstate.normal | ||||
| for f in actions[b'undelete'][0]: | for f in actions[b'undelete'][0]: | ||||
| if interactive: | if interactive: | ||||
| choice = repo.ui.promptchoice( | choice = repo.ui.promptchoice( | ||||
| _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f | _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f | ||||