| 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 (4 lines) |
| repo.wwrite(f, fc.data(), fc.flags()) | repo.wwrite(f, fc.data(), fc.flags()) | ||||
| def doremove(f): | def doremove(f): | ||||
| try: | try: | ||||
| rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs') | rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs') | ||||
| repo.wvfs.unlinkpath(f, rmdir=rmdir) | repo.wvfs.unlinkpath(f, rmdir=rmdir) | ||||
| except OSError: | except OSError: | ||||
| pass | pass | ||||
| repo.dirstate.remove(f) | repo.dirstate.set_untracked(f) | ||||
| def prntstatusmsg(action, f): | def prntstatusmsg(action, f): | ||||
| exact = names[f] | exact = names[f] | ||||
| if repo.ui.verbose or not exact: | if repo.ui.verbose or not exact: | ||||
| repo.ui.status(actions[action][1] % uipathfn(f)) | repo.ui.status(actions[action][1] % uipathfn(f)) | ||||
| audit_path = pathutil.pathauditor(repo.root, cached=True) | audit_path = pathutil.pathauditor(repo.root, cached=True) | ||||
| for f in actions[b'forget'][0]: | for f in actions[b'forget'][0]: | ||||
| else: | else: | ||||
| excluded_files.append(f) | excluded_files.append(f) | ||||
| else: | else: | ||||
| prntstatusmsg(b'remove', f) | prntstatusmsg(b'remove', f) | ||||
| doremove(f) | doremove(f) | ||||
| for f in actions[b'drop'][0]: | for f in actions[b'drop'][0]: | ||||
| audit_path(f) | audit_path(f) | ||||
| prntstatusmsg(b'drop', f) | prntstatusmsg(b'drop', f) | ||||
| repo.dirstate.remove(f) | repo.dirstate.set_untracked(f) | ||||
| normal = None | normal = None | ||||
| if node == parent: | if node == parent: | ||||
| # We're reverting to our parent. If possible, we'd like status | # We're reverting to our parent. If possible, we'd like status | ||||
| # to report the file as clean. We have to use normallookup for | # to report the file as clean. We have to use normallookup for | ||||
| # merges to avoid losing information about merged/dirty files. | # merges to avoid losing information about merged/dirty files. | ||||
| if p2 != repo.nullid: | if p2 != repo.nullid: | ||||
| normal = repo.dirstate.normallookup | normal = repo.dirstate.normallookup | ||||