| Alphare | |
| pulkit |
| hg-reviewers |
This is the newer, more semantic 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) |
| 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 | ||||
| else: | else: | ||||
| normal = repo.dirstate.normal | normal = repo.dirstate.set_clean | ||||
| newlyaddedandmodifiedfiles = set() | newlyaddedandmodifiedfiles = set() | ||||
| if interactive: | if interactive: | ||||
| # Prompt the user for changes to revert | # Prompt the user for changes to revert | ||||
| torevert = [f for f in actions[b'revert'][0] if f not in excluded_files] | torevert = [f for f in actions[b'revert'][0] if f not in excluded_files] | ||||
| m = scmutil.matchfiles(repo, torevert) | m = scmutil.matchfiles(repo, torevert) | ||||
| diffopts = patch.difffeatureopts( | diffopts = patch.difffeatureopts( | ||||
| repo.ui, | repo.ui, | ||||
| # 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.set_tracked(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.set_clean | ||||
| 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 | ||||
| ) | ) | ||||
| if choice == 0: | if choice == 0: | ||||
| prntstatusmsg(b'undelete', f) | prntstatusmsg(b'undelete', f) | ||||
| checkout(f) | checkout(f) | ||||